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).
This commit is contained in:
Juri Linkov 2019-09-26 21:26:27 +02:00 committed by Lars Ingebrigtsen
parent ce89cb760f
commit 648a6b7e91

View file

@ -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