;;; image-mode.el --- support for visiting image files
;;
-;; Copyright (C) 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2005, 2006 Free Software Foundation, Inc.
;;
;; Author: Richard Stallman <rms@gnu.org>
;; Keywords: multimedia
;; variables were cleared by kill-all-local-variables
(setq cursor-type nil truncate-lines t))
(run-mode-hooks 'image-mode-hook)
- (message (concat (substitute-command-keys
+ (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 (get-text-property (point-min) 'display)
(setq cursor-type nil truncate-lines t))
(add-hook 'change-major-mode-hook (lambda () (image-minor-mode -1)) nil t)
- (message (concat (substitute-command-keys
+ (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") "."))))
(message "Repeat this command to go back to displaying the image")))
;; Turn the image data into a real image, but only if the whole file
;; was inserted
- (let* ((data
- (string-make-unibyte
- (buffer-substring-no-properties (point-min) (point-max))))
- (image
- (create-image data nil t))
+ (let* ((image
+ (if (and (buffer-file-name)
+ (not (buffer-modified-p))
+ (not (and (boundp 'archive-superior-buffer)
+ archive-superior-buffer))
+ (not (and (boundp 'tar-superior-buffer)
+ tar-superior-buffer)))
+ (progn (clear-image-cache)
+ (create-image (buffer-file-name)))
+ (create-image
+ (string-make-unibyte
+ (buffer-substring-no-properties (point-min) (point-max)))
+ nil t)))
(props
`(display ,image
intangible ,image