From: Juri Linkov <juri@linkov.net>
Date: Mon, 13 Jun 2022 17:19:32 +0000 (+0300)
Subject: * lisp/progmodes/grep.el (grep-read-files): Combine files with aliases.
X-Git-Tag: emacs-29.0.90~1910^2~29
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7fdb53ddaf3af135d441e68edc86dd98ee157a8e;p=emacs.git

* 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).
---

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))))