diff options
| author | Juri Linkov <juri@jurta.org> | 2019-09-26 21:26:27 +0200 |
|---|---|---|
| committer | Lars Ingebrigtsen <larsi@gnus.org> | 2019-09-26 21:26:33 +0200 |
| commit | 648a6b7e912c97f9f4190cfd401274a2a33f31da (patch) | |
| tree | 3cacd512796042e2cc3f132b4773c4de9ebc86d1 /lisp/image-file.el | |
| parent | ce89cb760f35a7769769966fc3505604ba2b2f4d (diff) | |
| download | emacs-648a6b7e912c97f9f4190cfd401274a2a33f31da.tar.gz | |
Include ImageMagick file name regexps in image-file-name-regexp
* lisp/image-file.el (image-file-name-regexp): If compiled with
ImageMagick, include file name extensions it can handle (bug#9516).
Diffstat (limited to 'lisp/image-file.el')
| -rw-r--r-- | lisp/image-file.el | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/lisp/image-file.el b/lisp/image-file.el index c1d44a7d6d6..6f4ee7a953b 100644 --- a/lisp/image-file.el +++ b/lisp/image-file.el @@ -85,13 +85,12 @@ the variable is set using \\[customize]." image-file-name-extensions) t) "\\'")))) - (if image-file-name-regexps - (mapconcat 'identity - (if exts-regexp - (cons exts-regexp image-file-name-regexps) - image-file-name-regexps) - "\\|") - exts-regexp))) + (mapconcat + 'identity + (delq nil (list exts-regexp + image-file-name-regexps + (car (rassq 'imagemagick image-type-file-name-regexps)))) + "\\|"))) ;;;###autoload |