[Emacs-diffs] /srv/bzr/emacs/trunk r100410: * progmodes/grep.el (grep-read-files): Fix multi-pattern aliases.

[Juri Linkov]

------------------------------------------------------------
revno: 100410
committer: Juri Linkov <address@hidden>
branch nick: trunk
timestamp: Fri 2010-05-21 23:43:04 +0300
message:
  * 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)
modified:
  lisp/ChangeLog
  lisp/progmodes/grep.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-05-21 19:51:48 +0000
+++ b/lisp/ChangeLog    2010-05-21 20:43:04 +0000
@@ -1,3 +1,10 @@
+2010-05-21  Juri Linkov  <address@hidden>
+
+       * 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  <address@hidden>
 
        * progmodes/cc-engine.el (c-parse-state-get-strategy): Replace

=== modified file 'lisp/progmodes/grep.el'
--- a/lisp/progmodes/grep.el    2010-04-14 15:33:42 +0000
+++ b/lisp/progmodes/grep.el    2010-05-21 20:43:04 +0000
@@ -781,12 +781,17 @@
                  (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))))