Commit f992a935 authored by Chong Yidong's avatar Chong Yidong
Browse files

(image-mode): Revert 2007-01-30 changes.

parent a9bb04bb
......@@ -60,6 +60,12 @@ to toggle between display as an image and display as text."
(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 @@ and showing the image as an image."
(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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment