[Emacs-diffs] master 648a6b7: Include ImageMagick file name regexps in image-file-name-regexp

[Lars Ingebrigtsen]

branch: master
commit 648a6b7e912c97f9f4190cfd401274a2a33f31da
Author: Juri Linkov <address@hidden>
Commit: Lars Ingebrigtsen <address@hidden>

    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).
---
 lisp/image-file.el | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/lisp/image-file.el b/lisp/image-file.el
index c1d44a7..6f4ee7a 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