*** image-file.el.~1.34.~	2008-12-03 07:33:30.468750000 +0100
--- image-file.el	2008-12-26 12:18:42.562500000 +0100
***************
*** 143,149 ****
    "Yank handler for inserting an image into a buffer."
    (let ((len (length string))
  	(image (get-text-property 0 'display string)))
!     (remove-text-properties 0 len yank-excluded-properties string)
      (if (consp image)
  	(add-text-properties 0
  			     (or (next-single-property-change 0 'image-counter string)
--- 143,151 ----
    "Yank handler for inserting an image into a buffer."
    (let ((len (length string))
  	(image (get-text-property 0 'display string)))
!     (if (eq yank-excluded-properties t)
! 	(set-text-properties 0 len nil string)
!       (remove-list-of-text-properties 0 len yank-excluded-properties string))
      (if (consp image)
  	(add-text-properties 0
  			     (or (next-single-property-change 0 'image-counter string)