* image.el (image-type-from-buffer): Only return supported image type.

Fixes: debbugs:9045

* image.el (image-type-from-buffer): Only return supported image type.
Fixes: debbugs:9045
dce04f7f · Chong Yidong · cb3e7ae0 · dce04f7f · dce04f7f
Commit dce04f7f authored Apr 26, 2012 by Chong Yidong
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

lisp/ChangeLog lisp/ChangeLog +3 -0

lisp/image.el lisp/image.el +3 -1

No files found.
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
 2012-04-26  Chong Yidong  <cyd@gnu.org>

+	* 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)

--- a/lisp/image.el
+++ b/lisp/image.el
@@ -282,7 +282,9 @@ be determined."
 		  types nil)
 	  (setq types (cdr types)))))
    (goto-char opoint)
-    type))
+    (and type
+	 (memq type image-types)
+	 type)))


 ;;;###autoload