emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/filechooser d4cb4e870e 3/7: Use wildcard-to-regexp + ma


From: ELPA Syncer
Subject: [elpa] externals/filechooser d4cb4e870e 3/7: Use wildcard-to-regexp + mapconcat
Date: Mon, 5 Feb 2024 18:58:13 -0500 (EST)

branch: externals/filechooser
commit d4cb4e870e3eb03fb312c00d7b5500c0b98b33f5
Author: Rahguzar <rahguzar@zohomail.eu>
Commit: Rahguzar <rahguzar@zohomail.eu>

    Use wildcard-to-regexp + mapconcat
    
    Removes the use of rx-to-string and dired-glob-regexp
    From Philip Kaludercic's review
---
 filechooser.el | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/filechooser.el b/filechooser.el
index af4606585f..33fe4d2f97 100644
--- a/filechooser.el
+++ b/filechooser.el
@@ -169,13 +169,12 @@ With prefix ARG toggle multiple filters using 
`completing-read-multiple'."
         (current (caar (alist-get "current_filter" opts nil nil #'equal)))
         (regex-filters)
         (glob-to-regexp (lambda (cell) (if (eq  0 (car cell))
-                                      `(regexp ,(dired-glob-regexp (nth 1 
cell)))
+                                      `(regexp ,(wildcard-to-regexp (nth 1 
cell)))
                                     ""))))
     (unless (alist-get (car current) filters nil nil #'equal)
       (when current (push current filters)))
     (pcase-dolist (`(,name ,globs) filters)
-      (push (list name
-                  (rx-to-string `(or ,@(mapcar glob-to-regexp globs))))
+      (push (list name (mapconcat glob-to-regexp globs "\\|"))
             regex-filters))
     (when (and current (not (caar (alist-get "directory" opts nil nil 
#'equal))))
       (cl-callf not (cdr (alist-get (car current) regex-filters nil nil 
#'equal))))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]