diff options
Diffstat (limited to 'lisp/image-mode.el')
| -rw-r--r-- | lisp/image-mode.el | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/lisp/image-mode.el b/lisp/image-mode.el index 523ef3f73a8..c84dbab371d 100644 --- a/lisp/image-mode.el +++ b/lisp/image-mode.el @@ -60,16 +60,20 @@ 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) - (if (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) - (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") "."))) + (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") "."))))) ;;;###autoload (define-minor-mode image-minor-mode |