Mercurial > emacs
changeset 75745:19d4ee6e5621
(image-mode): Revert 2007-01-30 changes.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Fri, 09 Feb 2007 16:50:29 +0000 |
| parents | 53fa6ea37e3a |
| children | 188a250675e6 |
| files | lisp/image-mode.el |
| diffstat | 1 files changed, 6 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/image-mode.el Fri Feb 09 16:50:16 2007 +0000 +++ b/lisp/image-mode.el Fri Feb 09 16:50:29 2007 +0000 @@ -60,6 +60,12 @@ (setq major-mode 'image-mode) (use-local-map image-mode-map) (add-hook 'change-major-mode-hook 'image-toggle-display-text nil t) + (if (and (display-images-p) + (not (get-text-property (point-min) 'display))) + (image-toggle-display) + ;; Set next vars when image is already displayed but local + ;; variables were cleared by kill-all-local-variables + (setq cursor-type nil truncate-lines t)) (run-mode-hooks 'image-mode-hook) (if (display-images-p) (message "%s" (concat @@ -174,16 +180,6 @@ (if (called-interactively-p) (message "Repeat this command to go back to displaying the file as text"))))) -;; Don't override the setting from .emacs. -;;;###autoload (put 'image-toggle-display 'disabled t) - -(if (get 'image-toggle-display 'disabled) - (put 'image-toggle-display 'disabled "\ - -Warning: Displaying images in Emacs could be a security risk. -Please ensure that you are using up-to-date image libraries -and that the images being displayed come from a trusted source.")) - (provide 'image-mode) ;; arch-tag: b5b2b7e6-26a7-4b79-96e3-1546b5c4c6cb