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 ec4ee06eb144ce8f3014f3631e1506f7fdfabcd1..fd0b5b67835ba0b3a71d10b69cadf38546db8cbb 100644 (file)
--- 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))