[Emacs-diffs] trunk r114352: * image.el (image-type-from-buffer): Remove --without-x warning/error.

[Glenn Morris]

------------------------------------------------------------
revno: 114352
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2013-09-17 21:24:14 -0700
message:
  * image.el (image-type-from-buffer): Remove --without-x warning/error.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/image.el                  image.el-20091113204419-o5vbwnq5f7feedwu-1320

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-09-18 04:21:29 +0000
+++ b/lisp/ChangeLog    2013-09-18 04:24:14 +0000
@@ -1,5 +1,7 @@
 2013-09-18  Glenn Morris  <address@hidden>
 
+       * image.el (image-type-from-buffer): Remove --without-x warning/error.
+
        * mouse.el (mouse-yank-primary):
        Reorder to silence --without-x compilation.
 

=== modified file 'lisp/image.el'
--- a/lisp/image.el     2013-08-16 06:33:08 +0000
+++ b/lisp/image.el     2013-09-18 04:24:14 +0000
@@ -291,6 +291,7 @@
          (setq types (cdr types)))))
     (goto-char opoint)
     (and type
+        (boundp 'image-types)
         (memq type image-types)
         type)))