From: Thuna <thuna.cing@gmail.com>
Date: Wed, 21 Sep 2022 11:51:53 +0000 (+0200)
Subject: Correct the usage of `image-file-name-regexps'
X-Git-Tag: emacs-29.0.90~1856^2~328
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7a36828dc37e3dd79367e35664f5ae5349b278f0;p=emacs.git

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 0ed88e8e749..63f9e1100c6 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)))
      "\\|")))