From: Juri Linkov <juri@linkov.net>
Date: Sat, 14 Mar 2020 23:58:58 +0000 (+0200)
Subject: * lisp/image/image-converter.el: Support more ImageMagick versions (bug#39994)
X-Git-Tag: emacs-27.0.91~75
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f8254aad14;p=emacs.git

* lisp/image/image-converter.el: Support more ImageMagick versions (bug#39994)

* lisp/image/image-converter.el (image-converter--probe): Match
a possible additional second column in some ImageMagick versions
of "convert -list format".
---

diff --git a/lisp/image/image-converter.el b/lisp/image/image-converter.el
index 0488a13d41a..ae3d9598920 100644
--- a/lisp/image/image-converter.el
+++ b/lisp/image/image-converter.el
@@ -149,8 +149,9 @@ data is returned as a string."
       (when (re-search-forward "^-" nil t)
         (forward-line 1)
         ;; Lines look like
-        ;; "      WPG* r--   Word Perfect Graphics".
-        (while (re-search-forward "^ *\\([A-Z0-9]+\\)\\*? +r" nil t)
+        ;; "      WPG* r--   Word Perfect Graphics" or
+        ;; "      WPG* WPG       r--   Word Perfect Graphics".
+        (while (re-search-forward "^ *\\([A-Z0-9]+\\)\\*?\\(?: +[A-Z0-9]+\\)? +r" nil t)
           (push (downcase (match-string 1)) formats)))
       (nreverse formats))))