From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Mon, 21 Mar 2022 16:19:03 +0000 (+0100)
Subject: Allow using image-convert to view .bmp images
X-Git-Tag: emacs-29.0.90~1931^2~1011
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ede8ad507d06a336ce8202927f214aecbaf15d6b;p=emacs.git

Allow using image-convert to view .bmp images

* lisp/image.el (image-type-from-file-name): Allow Emacs to fall
back on image-convert to display .bmp images (bug#54492).
---

diff --git a/lisp/image.el b/lisp/image.el
index ec4ee06eb14..fd0b5b67835 100644
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -378,16 +378,16 @@ be determined."
 ;;;###autoload
 (defun image-type-from-file-name (file)
   "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."
-  (let (type first (case-fold-search t))
+Value is a symbol specifying the image type, or nil if type
+cannot be determined (or if Emacs doesn't have built-in support
+for the image type)."
+  (let ((case-fold-search t)
+        type)
     (catch 'found
-      (dolist (elem image-type-file-name-regexps first)
-	(when (string-match-p (car elem) file)
-	  (if (image-type-available-p (setq type (cdr elem)))
-	      (throw 'found type)
-	    ;; If nothing seems to be supported, return first type that matched.
-	    (or first (setq first type))))))))
+      (dolist (elem image-type-file-name-regexps)
+	(when (and (string-match-p (car elem) file)
+                   (image-type-available-p (setq type (cdr elem))))
+	  (throw 'found type))))))
 
 (declare-function image-convert-p "image-converter.el"
                   (source &optional image-format))