(ispell-keep-choices-win, ispell-dictionary-alist, ispell-word,

[gnu-emacs] / lisp / image-mode.el

diff --git a/lisp/image-mode.el b/lisp/image-mode.el
index 66f719ae1ebd595f3451964a093f61b34823b27b..eb08de1d6bbb12c7d0ba64d7be96a3296cdb42bf 100644 (file)
--- a/lisp/image-mode.el
+++ b/lisp/image-mode.el
@@ -1,6 +1,6 @@
 ;;; image-mode.el --- support for visiting image files
 ;;
-;; Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 ;;
 ;; Author: Richard Stallman <rms@gnu.org>
 ;; Keywords: multimedia
@@ -70,7 +70,7 @@ to toggle between display as an image and display as text."
   (if (display-images-p)
       (message "%s" (concat
                     (substitute-command-keys
-                     "Type \\[image-toggle-display] to view the image as ")
+                     "Type \\[image-toggle-display] to view as ")
                     (if (get-text-property (point-min) 'display)
                         "text" "an image") "."))))
 
@@ -111,7 +111,8 @@ information on these modes."
                         elt))
                     auto-mode-alist))))
     (if (assoc-default buffer-file-name mode-alist 'string-match)
-       (let ((auto-mode-alist mode-alist))
+       (let ((auto-mode-alist mode-alist)
+             (magic-mode-alist nil))
          (set-auto-mode)
          (image-minor-mode t))
       (image-mode))))