From ab145daf37fde928424742bd87a55e67b09254bc Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Tue, 29 Aug 2006 13:02:53 +0000 Subject: [PATCH] * image-mode.el (image-mode): Fix last fix. Suggested by Kim F. Storm. --- lisp/ChangeLog | 5 +++++ lisp/image-mode.el | 27 +++++++++++++-------------- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1aeaf174e37..78e0ee532f6 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2006-08-29 Chong Yidong + + * image-mode.el (image-mode): Fix last fix. + Suggested by Kim F. Storm. + 2006-08-29 Michael Albinus Sync with Tramp 2.0.54. diff --git a/lisp/image-mode.el b/lisp/image-mode.el index c84dbab371d..66f719ae1eb 100644 --- a/lisp/image-mode.el +++ b/lisp/image-mode.el @@ -60,20 +60,19 @@ 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) - (let ((image-display-supported-p (memq window-system '(x w32 mac)))) - (if (and image-display-supported-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 - (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") "."))))) + (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 + (substitute-command-keys + "Type \\[image-toggle-display] to view the image as ") + (if (get-text-property (point-min) 'display) + "text" "an image") ".")))) ;;;###autoload (define-minor-mode image-minor-mode -- 2.39.2