* progmodes/grep.el (grep-read-files): Fix multi-pattern aliases.

Remove "all" from grep-files-aliases.  Split grep-files-aliases by
whitespace, call wildcard-to-regexp on substrings and concat them
with "\\|".  (Bug#6114)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7c0fb21483f396ba739e98c87c47d3cbf39ca8f8..e59c4a45c298ed19b8fbfe9bb2361ba72c57fe71 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2010-05-21  Juri Linkov  <juri@jurta.org>
+
+       * progmodes/grep.el (grep-read-files): Fix multi-pattern aliases.
+       Remove "all" from grep-files-aliases.  Split grep-files-aliases by
+       whitespace, call wildcard-to-regexp on substrings and concat them
+       with "\\|".  (Bug#6114)
+
 2010-05-21  Alan Mackenzie  <acm@muc.de>
 
        * progmodes/cc-engine.el (c-parse-state-get-strategy): Replace

diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index de94620c737660bef6b459eb34c914594257b587..3f5fa543813926addb61a4cf38ca968ab31013f1 100644 (file)
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -781,12 +781,17 @@ substitution string.  Note dynamic scoping of variables.")
                  (file-name-nondirectory bn)))
         (default-alias
           (and fn
-               (let ((aliases grep-files-aliases)
+               (let ((aliases (remove (assoc "all" grep-files-aliases)
+                                      grep-files-aliases))
                      alias)
                  (while aliases
                    (setq alias (car aliases)
                          aliases (cdr aliases))
-                   (if (string-match (wildcard-to-regexp (cdr alias)) fn)
+                   (if (string-match (mapconcat
+                                      'wildcard-to-regexp
+                                      (split-string (cdr alias) nil t)
+                                      "\\|")
+                                     fn)
                        (setq aliases nil)
                      (setq alias nil)))
                  (cdr alias))))