(image-mode): Don't automatically view as image.

diff --git a/lisp/image-mode.el b/lisp/image-mode.el
index 5b24aa316dd657fb550945ffbbf545b8bb655c69..97f1a7902dc524a19b8cd6ed1f3eabd97cda427e 100644 (file)
--- a/lisp/image-mode.el
+++ b/lisp/image-mode.el
@@ -60,17 +60,11 @@ 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
                     (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") "."))))