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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index af062359d4e2e060ec1e4631d41462780dbaaee5..747a2bf52654b395f3ab9d357e3cc74edd216581 100644 (file)
--- 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 6c15a7d0b96836d42421351727e4519d3085a7e6..8afe3e14b104c019e292754c3cbc178078c10d76 100644 (file)
--- 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)))