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

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      06/08/29 13:02:53

Index: image-mode.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/image-mode.el,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- image-mode.el       28 Aug 2006 22:49:25 -0000      1.14
+++ image-mode.el       29 Aug 2006 13:02:53 -0000      1.15
@@ -60,20 +60,19 @@
   (setq major-mode 'image-mode)
   (use-local-map image-mode-map)
   (add-hook 'change-major-mode-hook 'image-toggle-display-text nil t)
-  (let ((image-display-supported-p (memq window-system '(x w32 mac))))
-    (if (and image-display-supported-p
+  (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 image-display-supported-p
+  (if (display-images-p)
        (message "%s" (concat
                       (substitute-command-keys
                        "Type \\[image-toggle-display] to view the image as ")
                       (if (get-text-property (point-min) 'display)
-                          "text" "an image") ".")))))
+                        "text" "an image") "."))))
 
 ;;;###autoload
 (define-minor-mode image-minor-mode