master 1997e3b 1/2: Fix image-converter probing

[Lars Ingebrigtsen]

branch: master
commit 1997e3b80f1046d789c4120d50e0f1dde05e7a74
Author: Lars Ingebrigtsen <address@hidden>
Commit: Lars Ingebrigtsen <address@hidden>

    Fix image-converter probing
    
    * lisp/image/image-converter.el (image-converter--find-converter):
    Stop probing on the first successful probe.
---
 lisp/image/image-converter.el | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/lisp/image/image-converter.el b/lisp/image/image-converter.el
index f251d5c..f046529 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."