[Emacs-diffs] emacs/lisp ChangeLog image-mode.el

[Andreas Schwab]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Andreas Schwab <schwab> 09/02/07 15:29:14

Modified files:
        lisp           : ChangeLog image-mode.el 

Log message:
        (image-mode): Always set image-type.
        (image-minor-mode): Likewise.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15273&r2=1.15274
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/image-mode.el?cvsroot=emacs&r1=1.54&r2=1.55

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15273
retrieving revision 1.15274
diff -u -b -r1.15273 -r1.15274
--- ChangeLog   7 Feb 2009 15:16:57 -0000       1.15273
+++ ChangeLog   7 Feb 2009 15:29:11 -0000       1.15274
@@ -1,3 +1,8 @@
+2009-02-07  Andreas Schwab  <address@hidden>
+
+       * image-mode.el (image-mode): Always set image-type.
+       (image-minor-mode): Likewise.
+
 2009-02-07  Eli Zaretskii  <address@hidden>
 
        * mail/rmailedit.el (rmail-cease-edit): Look for the message's

Index: image-mode.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/image-mode.el,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- image-mode.el       5 Feb 2009 23:57:39 -0000       1.54
+++ image-mode.el       7 Feb 2009 15:29:14 -0000       1.55
@@ -321,7 +321,6 @@
 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 @@
        ;; 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 @@
     (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)