aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuri Linkov2020-03-30 02:16:12 +0300
committerJuri Linkov2020-03-30 02:16:12 +0300
commitc6e0981b96eaa12c28b70c949ccd6e426c13df4d (patch)
treecbf316fa4f3f43a3978cd4a05c2168c32cd84b6e
parent461bd9cc20b778b934ecbd276f4905fedb7d8c18 (diff)
downloademacs-c6e0981b96eaa12c28b70c949ccd6e426c13df4d.tar.gz
emacs-c6e0981b96eaa12c28b70c949ccd6e426c13df4d.zip
* lisp/image/image-converter.el: Fix customization of image-converter.
* lisp/image/image-converter.el (image-convert-p): Update image-converter-regexp when image-converter was customized (bug#39994).
-rw-r--r--lisp/image/image-converter.el4
1 files changed, 4 insertions, 0 deletions
diff --git a/lisp/image/image-converter.el b/lisp/image/image-converter.el
index ae3d9598920..b694052f5b9 100644
--- a/lisp/image/image-converter.el
+++ b/lisp/image/image-converter.el
@@ -57,6 +57,10 @@ is a string, it should be a MIME format string like
57 ;; Find an installed image converter. 57 ;; Find an installed image converter.
58 (unless image-converter 58 (unless image-converter
59 (image-converter--find-converter)) 59 (image-converter--find-converter))
60 ;; When image-converter was customized
61 (if (and image-converter (not image-converter-regexp))
62 (when-let ((formats (image-converter--probe image-converter)))
63 (setq image-converter-regexp (concat "\\." (regexp-opt formats) "\\'"))))
60 (and image-converter 64 (and image-converter
61 (or (and (not data-p) 65 (or (and (not data-p)
62 (string-match image-converter-regexp source)) 66 (string-match image-converter-regexp source))