[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 7fdb53ddaf: * lisp/progmodes/grep.el (grep-read-files): Combine f
From: |
Juri Linkov |
Subject: |
master 7fdb53ddaf: * lisp/progmodes/grep.el (grep-read-files): Combine files with aliases. |
Date: |
Mon, 13 Jun 2022 13:19:53 -0400 (EDT) |
branch: master
commit 7fdb53ddaf3af135d441e68edc86dd98ee157a8e
Author: Juri Linkov <juri@linkov.net>
Commit: Juri Linkov <juri@linkov.net>
* lisp/progmodes/grep.el (grep-read-files): Combine files with aliases.
Use completion-table-merge to combine completions of files from
read-file-name-internal with a list of defaults from grep-files-aliases
(bug#55800).
---
lisp/progmodes/grep.el | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index 4dedbc66ae..a3ef90f397 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -1066,15 +1066,18 @@ REGEXP is used as a string in the prompt."
default-extension
(car grep-files-history)
(car (car grep-files-aliases))))
+ (defaults
+ (delete-dups
+ (delq nil
+ (append (list default default-alias default-extension)
+ (mapcar #'car grep-files-aliases)))))
(files (completing-read
(format-prompt "Search for \"%s\" in files matching wildcard"
default regexp)
- #'read-file-name-internal
- nil nil nil 'grep-files-history
- (delete-dups
- (delq nil
- (append (list default default-alias default-extension)
- (mapcar #'car grep-files-aliases)))))))
+ (completion-table-merge
+ (lambda (_string _pred _action) defaults)
+ #'read-file-name-internal)
+ nil nil nil 'grep-files-history defaults)))
(and files
(or (cdr (assoc files grep-files-aliases))
files))))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master 7fdb53ddaf: * lisp/progmodes/grep.el (grep-read-files): Combine files with aliases.,
Juri Linkov <=