bug#577: 23.0.60; editing image files in non-X frames

bug#577: 23.0.60; editing image files in non-X frames

[Markus Triska]

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  <markus.triska@gmx.at>

	* 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

bug#577: marked as done (23.0.60; editing image files in non-X frames)

[Emacs bug Tracking System]

[-- Attachment #1: Type: text/plain, Size: 853 bytes --]


Your message dated Wed, 30 Jul 2008 09:35:19 -0400
with message-id <87iqun8pgo.fsf@stupidchicken.com>
and subject line Re: 23.0.60; editing image files in non-X frames
has caused the Emacs bug report #577,
regarding 23.0.60; editing image files in non-X frames
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact don@donarmstrong.com
immediately.)


-- 
577: http://emacsbugs.donarmstrong.com/cgi-bin/bugreport.cgi?bug=577
Emacs Bug Tracking System
Contact don@donarmstrong.com with problems

[-- Attachment #2: Type: message/rfc822, Size: 3321 bytes --]

From: Markus Triska <markus.triska@gmx.at>
To: emacs-pretest-bug@gnu.org
Subject: 23.0.60; editing image files in non-X frames
Date: Sat, 19 Jul 2008 13:39:38 +0200 (CEST)
Message-ID: <20080719113938.E934599A0AF@mt-computer.local>

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  <markus.triska@gmx.at>

	* 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



[-- Attachment #3: Type: message/rfc822, Size: 1165 bytes --]

From: Chong Yidong <cyd@stupidchicken.com>
To: Markus Triska <markus.triska@gmx.at>
Cc: 577-done@emacsbugs.donarmstrong.com
Subject: Re: 23.0.60; editing image files in non-X frames
Date: Wed, 30 Jul 2008 09:35:19 -0400
Message-ID: <87iqun8pgo.fsf@stupidchicken.com>

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

Checked in.  Thanks.