Subject: 23.0.60; editing image files in non-X frames

From: Markus Triska <[email-masked]>
Date: Sat, 19 Jul 2008 13:39:38 +0200 (CEST)

When I do "emacs -Q -nw sample.png", I cannot use C-n etc. on the
image data. The following patch fixes this.

2008-07-19  Markus Triska  <[email-masked]>

	* image-mode.el (image-mode): Set image-mode-text-map when image
	cannot be displayed.

diff --git a/lisp/image-mode.el b/lisp/image-mode.el
index 5ffbfe1..fb2eaf1 100644
--- a/lisp/image-mode.el
+++ b/lisp/image-mode.el
@@ -333,13 +333,14 @@ to toggle between display as an image and display as text."
   (image-mode-setup-winprops)
 
   (add-hook 'change-major-mode-hook 'image-toggle-display-text nil t)
-  (if (and (display-images-p)
-	   (not (image-get-display-property)))
-      (image-toggle-display)
-    ;; Set next vars when image is already displayed but local
-    ;; variables were cleared by kill-all-local-variables
-    (use-local-map image-mode-map)
-    (setq cursor-type nil truncate-lines t))
+  (if (display-images-p)
+      (if (not (image-get-display-property))
+	  (image-toggle-display)
+	;; Set next vars when image is already displayed but local
+	;; variables were cleared by kill-all-local-variables
+	(use-local-map image-mode-map)
+	(setq cursor-type nil truncate-lines t))
+    (use-local-map image-mode-text-map))
   (run-mode-hooks 'image-mode-hook)
   (if (display-images-p)
       (message "%s" (concat