[Emacs-diffs] Changes to emacs/lisp/image-file.el

[Kim F . Storm]

Index: emacs/lisp/image-file.el
diff -c emacs/lisp/image-file.el:1.24 emacs/lisp/image-file.el:1.25
*** emacs/lisp/image-file.el:1.24       Thu Jul 21 08:56:23 2005
--- emacs/lisp/image-file.el    Fri Jul 22 13:11:34 2005
***************
*** 118,124 ****
              (create-image data nil t))
             (props
              `(display ,image
!                       yank-handler (image-file-yank-handler)
                        intangible ,image
                        rear-nonsticky (display intangible)
                        ;; This a cheap attempt to make the whole buffer
--- 118,125 ----
              (create-image data nil t))
             (props
              `(display ,image
!                       yank-handler
!                       (image-file-yank-handler nil t)
                        intangible ,image
                        rear-nonsticky (display intangible)
                        ;; This a cheap attempt to make the whole buffer
***************
*** 141,152 ****
  ;; 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)))
      (if (consp image)
!       (put-text-property 0 (length string)
!                          'display
!                          (cons (car image) (cdr image))
!                          string))
      (insert string)))
  
  (put 'image-file-handler 'safe-magic t)
--- 142,159 ----
  ;; recognized as two different images.
  (defun image-file-yank-handler (string)
    "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)
!                                (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)