mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-30 04:10:54 -08:00
Code Issues Projects Releases Wiki Activity

(insert-image): Save a little consing.

Browse source
This commit is contained in:
Dave Love 2000-06-12 20:36:40 +00:00
parent c68833d2ca
commit 0dc91c572f
2 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lisp/ChangeLog
View file

@ -1,3 +1,7 @@
2000-06-12 Dave Love <fx@gnu.org>
* image.el (insert-image): Save a little consing.
2000-06-12 Kenichi Handa <handa@etl.go.jp>
* language/tibet-util.el: Convert all tibetan-1-column characters

19
lisp/image.el
View file

@ -151,15 +151,22 @@ means display it in the right marginal area."
(error "Not an image: %s" image))
(unless (or (null area) (memq area '(left-margin right-margin)))
(error "Invalid area %s" area))
(when area
(setq image (list (list 'margin area) image)))
(if area
(setq image (list (list 'margin area) image))
;; Cons up a new spec equal but not eq to `image' so that
;; inserting it twice in a row (adjacently) displays two copies of
;; the image. Don't try to avoid this by looking at the display
;; properties on either side so that we DTRT more often with
;; cut-and-paste. (Yanking killed image text next to another copy
;; of it loses anyway.)
(setq image (cons 'image (cdr image))))
(let ((start (point)))
(insert string)
;; Copy `image' so that inserting it twice in a row (adjacently)
;; displays two copies of the image.
(add-text-properties start (point)
(list 'display (copy-sequence image)
'intangible (list t) ; something unique
(list 'display image
;; `image' has the right properties to
;; mark an intangible field.
'intangible image
'rear-nonsticky (list 'display)))))