Correct the usage of `image-file-name-regexps'

* lisp/image-file.el (image-file-name-regexp): Treat
`image-file-name-regexps' as a list of regexps (as documented) in
addition to a regexp string (bug#57971).

Copyright-paperwork-exempt: yes

diff --git a/lisp/image-file.el b/lisp/image-file.el
index 0ed88e8e7499ed4b4a5f6d2fdfa183f53380a8a3..63f9e1100c60e63928b006132b0686fbdb52aea7 100644 (file)
--- a/lisp/image-file.el
+++ b/lisp/image-file.el
@@ -91,9 +91,10 @@ the variable is set using \\[customize]."
                      "\\'"))))
     (mapconcat
      #'identity
-     (delq nil (list exts-regexp
-                    image-file-name-regexps
-                    (car (rassq 'imagemagick image-type-file-name-regexps))))
+     (delq nil
+           (nconc (list exts-regexp
+                        (car (rassq 'imagemagick image-type-file-name-regexps)))
+                 (ensure-list image-file-name-regexps)))
      "\\|")))