[Emacs-diffs] Changes to emacs/lisp/image-mode.el, v [EMACS_22_BASE]

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Branch:         EMACS_22_BASE
Changes by:     Chong Yidong <cyd>      08/07/30 13:38:29

Index: image-mode.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/image-mode.el,v
retrieving revision 1.21.2.5
retrieving revision 1.21.2.6
diff -u -b -r1.21.2.5 -r1.21.2.6
--- image-mode.el       7 Jan 2008 02:44:40 -0000       1.21.2.5
+++ image-mode.el       30 Jul 2008 13:38:28 -0000      1.21.2.6
@@ -208,13 +208,14 @@
   (setq mode-name "Image")
   (setq major-mode 'image-mode)
   (add-hook 'change-major-mode-hook 'image-toggle-display-text nil t)
-  (if (and (display-images-p)
-          (not (get-text-property (point-min) 'display)))
+  (if (display-images-p)
+      (if (not (image-get-display-property))
       (image-toggle-display)
     ;; 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))
+    (use-local-map image-mode-text-map))
   (run-mode-hooks 'image-mode-hook)
   (if (display-images-p)
       (message "%s" (concat