procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(insert-image-file, image-file-yank-handler): Fix

Browse source 
last change to maintain a (unique) yank-handler on yanked images.
This commit is contained in:
Kim F. Storm 2005-07-22 13:11:34 +00:00
parent 80362dd2c0
commit eab4879567
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
lisp/image-file.el
View file

@ -118,7 +118,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 +142,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)