master c9c3d5d830 1/2: Revert "Allow using image-convert to view .bmp images"

[Lars Ingebrigtsen]

branch: master
commit c9c3d5d8304fcaf69e0de085d762b10b63779cb2
Author: Lars Ingebrigtsen <larsi@gnus.org>
Commit: Lars Ingebrigtsen <larsi@gnus.org>

    Revert "Allow using image-convert to view .bmp images"
    
    This reverts commit ede8ad507d06a336ce8202927f214aecbaf15d6b.
    
    This leads to failures for usages of the function where
    Emacs doesn't have support for the formats.
---
 lisp/image.el | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/lisp/image.el b/lisp/image.el
index bad8ba7cd7..7306f47627 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 (or if Emacs doesn't have built-in support
-for the image type)."
-  (let ((case-fold-search t)
-        type)
+Value is a symbol specifying the image type, or nil if type cannot
+be determined."
+  (let (type first (case-fold-search t))
     (catch 'found
-      (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))))))
+      (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))))))))
 
 (declare-function image-convert-p "image-converter.el"
                   (source &optional image-format))