procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Remove "all" from grep-files-aliases.  Split grep-files-aliases by
whitespace, call wildcard-to-regexp on substrings and concat them
with "\\|".  (Bug#6114)
This commit is contained in:
Juri Linkov 2010-05-21 23:43:04 +03:00
parent c0209c2c68
commit df9db1517e
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lisp/ChangeLog
View file

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

9
lisp/progmodes/grep.el
View file

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