[Emacs-diffs] /srv/bzr/emacs/trunk r108044: * image.el (image-type-from-buffer): Only return supported image type.

[Chong Yidong]

------------------------------------------------------------
revno: 108044
fixes bug(s): http://debbugs.gnu.org/9045
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Thu 2012-04-26 16:43:20 +0800
message:
  * image.el (image-type-from-buffer): Only return supported image type.
modified:
  lisp/ChangeLog
  lisp/image.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-04-26 08:00:47 +0000
+++ b/lisp/ChangeLog    2012-04-26 08:43:20 +0000
@@ -1,5 +1,8 @@
 2012-04-26  Chong Yidong  <address@hidden>
 
+       * image.el (image-type-from-buffer): Only return supported image
+       type (Bug#9045).
+
        * vc/diff-mode.el (diff-beginning-of-hunk): Return a meaningful
        value, for symmetry with diff-end-of-hunk.
        (diff-split-hunk, diff-find-source-location)

=== modified file 'lisp/image.el'
--- a/lisp/image.el     2012-04-16 03:47:43 +0000
+++ b/lisp/image.el     2012-04-26 08:43:20 +0000
@@ -282,7 +282,9 @@
                  types nil)
          (setq types (cdr types)))))
     (goto-char opoint)
-    type))
+    (and type
+        (memq type image-types)
+        type)))
 
 
 ;;;###autoload