From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Tue, 29 Oct 2019 20:16:40 +0000 (+0100)
Subject: Fix image-converter probing
X-Git-Tag: emacs-27.0.90~835
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1997e3b80f1046d789c4120d50e0f1dde05e7a74;p=emacs.git

Fix image-converter probing

* lisp/image/image-converter.el (image-converter--find-converter):
Stop probing on the first successful probe.
---

diff --git a/lisp/image/image-converter.el b/lisp/image/image-converter.el
index f251d5ca590..f046529fd57 100644
--- a/lisp/image/image-converter.el
+++ b/lisp/image/image-converter.el
@@ -149,10 +149,12 @@ where created with DATA-P nil (i.e., it has to refer to a file)."
 
 (defun image-converter--find-converter ()
   "Find an installed image converter."
-  (dolist (elem image-converter--converters)
-    (when-let ((formats (image-converter--probe (car elem))))
-      (setq image-converter (car elem)
-            image-converter-regexp (concat "\\." (regexp-opt formats) "\\'")))))
+  (catch 'done
+    (dolist (elem image-converter--converters)
+      (when-let ((formats (image-converter--probe (car elem))))
+        (setq image-converter (car elem)
+              image-converter-regexp (concat "\\." (regexp-opt formats) "\\'"))
+        (throw 'done image-converter)))))
 
 (cl-defmethod image-converter--convert ((type (eql graphicsmagick)) file)
   "Convert using GraphicsMagick."