From: Chong Yidong <cyd@stupidchicken.com>
Date: Mon, 28 Aug 2006 22:49:25 +0000 (+0000)
Subject: * image-mode.el (image-mode): Display image as text on a terminal.
X-Git-Tag: emacs-pretest-22.0.90~836
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0e8b7151caab1f574ec2898bcad008afffc7e5db;p=emacs.git

* image-mode.el (image-mode): Display image as text on a terminal.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ec5296ba0ca..b857f9e85ec 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2006-08-28  Chong Yidong  <cyd@stupidchicken.com>
+
+	* image-mode.el (image-mode): Display image as text on a terminal.
+
 2006-08-28  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* progmodes/python.el (python-send-command): Simplify.
diff --git a/lisp/image-mode.el b/lisp/image-mode.el
index 523ef3f73a8..c84dbab371d 100644
--- a/lisp/image-mode.el
+++ b/lisp/image-mode.el
@@ -60,16 +60,20 @@ 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 (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)
-  (message "%s" (concat (substitute-command-keys
-		    "Type \\[image-toggle-display] to view the image as ")
-		   (if (get-text-property (point-min) 'display)
-		       "text" "an image") ".")))
+  (let ((image-display-supported-p (memq window-system '(x w32 mac))))
+    (if (and image-display-supported-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 image-display-supported-p
+	(message "%s" (concat
+		       (substitute-command-keys
+			"Type \\[image-toggle-display] to view the image as ")
+		       (if (get-text-property (point-min) 'display)
+			   "text" "an image") ".")))))
 
 ;;;###autoload
 (define-minor-mode image-minor-mode