(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 97f1a7902dc524a19b8cd6ed1f3eabd97cda427e..eb08de1d6bbb12c7d0ba64d7be96a3296cdb42bf 100644 (file)
--- a/lisp/image-mode.el
+++ b/lisp/image-mode.el
@@ -60,6 +60,12 @@ 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 (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
@@ -105,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))))