Commit ea1d4aac authored by Glenn Morris's avatar Glenn Morris

image-type-from-file-name fix for bug#9045

* lisp/image.el (image-type-from-file-name): If multiple types match,
return the first one that is supported.
parent f961c7d8
2012-10-23 Glenn Morris <rgm@gnu.org>
* image.el (image-type-from-file-name): If multiple types match,
return the first one that is supported. (Bug#9045)
2012-10-22 Glenn Morris <rgm@gnu.org>
* image.el (imagemagick-enabled-types): Doc fix.
......
......@@ -308,8 +308,17 @@ be determined."
"Determine the type of image file FILE from its name.
Value is a symbol specifying the image type, or nil if type cannot
be determined."
(assoc-default file image-type-file-name-regexps 'string-match-p))
(let (type first)
(or
(catch 'found
(dolist (elem image-type-file-name-regexps)
(when (string-match-p (car elem) file)
(setq type (cdr elem))
(or first (setq first type))
(if (image-type-available-p type)
(throw 'found type)))))
;; If nothing seems to be supported, return the first type that matched.
first)))
;;;###autoload
(defun image-type (source &optional type data-p)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment