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

(image-mode): Always set image-type.

Browse source 
(image-minor-mode): Likewise.
This commit is contained in:
Andreas Schwab 2009-02-07 15:29:11 +00:00
parent 782c80e892
commit d2e9b790b7
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2009-02-07 Andreas Schwab <schwab@suse.de>
* image-mode.el (image-mode): Always set image-type.
(image-minor-mode): Likewise.
2009-02-07 Eli Zaretskii <eliz@gnu.org>
* mail/rmailedit.el (rmail-cease-edit): Look for the message's

9
lisp/image-mode.el
View file

@ -321,7 +321,6 @@ You can use \\<image-mode-map>\\[image-toggle-display]
to toggle between display as an image and display as text."
(interactive)
(kill-all-local-variables)
(setq mode-name "Image[text]")
(setq major-mode 'image-mode)
;; Use our own bookmarking function for images.
(set (make-local-variable 'bookmark-make-record-function)
@ -337,8 +336,11 @@ to toggle between display as an image and display as text."
;; Set next vars when image is already displayed but local
;; variables were cleared by kill-all-local-variables
(use-local-map image-mode-map)
(setq cursor-type nil truncate-lines t))
(setq cursor-type nil truncate-lines t
image-type (plist-get (cdr (image-get-display-property)) :type)))
(setq image-type "text")
(use-local-map image-mode-text-map))
(setq mode-name (format "Image[%s]" image-type))
(run-mode-hooks 'image-mode-hook)
(if (display-images-p)
(message "%s" (concat
@ -362,7 +364,8 @@ See the command `image-mode' for more information on this mode."
(if (display-images-p)
(if (not (image-get-display-property))
(image-toggle-display)
(setq cursor-type nil truncate-lines t))
(setq cursor-type nil truncate-lines t
image-type (plist-get (cdr (image-get-display-property)) :type)))
(setq image-type "text")
(use-local-map image-mode-text-map))
(if (display-images-p)