master 7a36828dc3: Correct the usage of `image-file-name-regexps'

[Lars Ingebrigtsen]

branch: master
commit 7a36828dc37e3dd79367e35664f5ae5349b278f0
Author: Thuna <thuna.cing@gmail.com>
Commit: Lars Ingebrigtsen <larsi@gnus.org>

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

diff --git a/lisp/image-file.el b/lisp/image-file.el
index 0ed88e8e74..63f9e1100c 100644
--- 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)))
      "\\|")))