diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2011-09-19 15:27:30 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2011-09-19 15:27:30 -0400 |
| commit | 345083b2cbbe0fec01a7d2c052bd20d723675e2a (patch) | |
| tree | ea65e486c85d0cda03acd11a7c5f09c39d5a78c6 /lisp/image-mode.el | |
| parent | 08d355e3eb01f875e64828e5eabea56f874567f1 (diff) | |
| download | emacs-345083b2cbbe0fec01a7d2c052bd20d723675e2a.tar.gz | |
* lisp/ps-mule.el (ps-mule-plot-string): Don't inf-loop.
* lisp/image-mode.el (image-toggle-display-text)
(image-toggle-display-image): Stay away from evil `intangible'.
Fixes: debbugs:5108
Diffstat (limited to 'lisp/image-mode.el')
| -rw-r--r-- | lisp/image-mode.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/image-mode.el b/lisp/image-mode.el index cffa2592aa1..0995048fce5 100644 --- a/lisp/image-mode.el +++ b/lisp/image-mode.el @@ -465,7 +465,7 @@ Remove text properties that display the image." (buffer-undo-list t) (modified (buffer-modified-p))) (remove-list-of-text-properties (point-min) (point-max) - '(display intangible read-nonsticky + '(display read-nonsticky ;; intangible read-only front-sticky)) (set-buffer-modified-p modified) (if (called-interactively-p 'any) @@ -506,8 +506,8 @@ was inserted." (setq image (append image (image-transform-properties image))) (setq props `(display ,image - intangible ,image - rear-nonsticky (display intangible) + ;; intangible ,image + rear-nonsticky (display) ;; intangible read-only t front-sticky (read-only))) (let ((buffer-file-truename nil)) ; avoid changing dir mtime by lock_file |