From: Glenn Morris <rgm@gnu.org>
Date: Wed, 18 Sep 2013 04:24:14 +0000 (-0700)
Subject: * image.el (image-type-from-buffer): Remove --without-x warning/error.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1557
X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/67645389fc19c3573bb94f9f7d94195ac0b7b48f

* image.el (image-type-from-buffer): Remove --without-x warning/error.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index af062359d4..747a2bf526 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2013-09-18  Glenn Morris  <rgm@gnu.org>
 
+	* image.el (image-type-from-buffer): Remove --without-x warning/error.
+
 	* mouse.el (mouse-yank-primary):
 	Reorder to silence --without-x compilation.
 
diff --git a/lisp/image.el b/lisp/image.el
index 6c15a7d0b9..8afe3e14b1 100644
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -291,6 +291,7 @@ be determined."
 	  (setq types (cdr types)))))
     (goto-char opoint)
     (and type
+	 (boundp 'image-types)
 	 (memq type image-types)
 	 type)))