X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/6ed554f2ac35c8cf4365c7bb435e99cf54122ff3..cb58ea33227cfe3fa6bc71483097a0aecfff826f:/lisp/image-file.el

diff --git a/lisp/image-file.el b/lisp/image-file.el
index be95470184..d90f5efc8c 100644
--- a/lisp/image-file.el
+++ b/lisp/image-file.el
@@ -1,6 +1,7 @@
 ;;; image-file.el --- support for visiting image files
 ;;
-;; Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
+;;   2005, 2006 Free Software Foundation, Inc.
 ;;
 ;; Author: Miles Bader <miles@gnu.org>
 ;; Keywords: multimedia
@@ -118,7 +119,8 @@ the command `insert-file-contents'."
 	      (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 +143,18 @@ the command `insert-file-contents'."
 ;; 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)