diff options
| author | Juri Linkov <juri@linkov.net> | 2022-06-13 20:19:32 +0300 |
|---|---|---|
| committer | Juri Linkov <juri@linkov.net> | 2022-06-13 20:19:32 +0300 |
| commit | 7fdb53ddaf3af135d441e68edc86dd98ee157a8e (patch) | |
| tree | 5e130e93f1d11c20555f2f43e61be8f61b020550 | |
| parent | abe75e55209073366670339c519fa69a3f93441e (diff) | |
| download | emacs-7fdb53ddaf3af135d441e68edc86dd98ee157a8e.tar.gz | |
* 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).
| -rw-r--r-- | lisp/progmodes/grep.el | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el index 4dedbc66aee..a3ef90f397e 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)))) |