# HG changeset patch
# User Kim F. Storm <storm@cua.dk>
# Date 1122037894 0
# Node ID 7a0be66e1adb811770604b5e837c05d77b29aeef
# Parent  3b0b558e870433b78dcbbb5752b3ca4a43c2728e
(insert-image-file, image-file-yank-handler): Fix
last change to maintain a (unique) yank-handler on yanked images.

diff -r 3b0b558e8704 -r 7a0be66e1adb lisp/image-file.el
--- a/lisp/image-file.el	Fri Jul 22 13:02:19 2005 +0000
+++ b/lisp/image-file.el	Fri Jul 22 13:11:34 2005 +0000
@@ -118,7 +118,8 @@
 	      (create-image data nil t))
 	     (props
 	      `(display ,image
-			yank-handler (image-file-yank-handler)
+			yank-handler
+			(image-file-yank-handler nil t)
 			intangible ,image
 			rear-nonsticky (display intangible)
 			;; This a cheap attempt to make the whole buffer
@@ -141,12 +142,18 @@
 ;; recognized as two different images.
 (defun image-file-yank-handler (string)
   "Yank handler for inserting an image into a buffer."
-  (let ((image (get-text-property 0 'display string)))
+  (let ((len (length string))
+	(image (get-text-property 0 'display string)))
+    (remove-text-properties 0 len yank-excluded-properties string)
     (if (consp image)
-	(put-text-property 0 (length string)
-			   'display
-			   (cons (car image) (cdr image))
-			   string))
+	(add-text-properties 0
+			     (or (next-single-property-change 0 'image-counter string)
+				 (length string))
+			     `(display
+			       ,(cons (car image) (cdr image))
+			       yank-handler
+			       ,(cons 'image-file-yank-handler '(nil t)))
+			     string))
     (insert string)))
 
 (put 'image-file-handler 'safe-magic t)