mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-15 10:30:25 -08:00
* 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)
This commit is contained in:
parent
c0209c2c68
commit
df9db1517e
2 changed files with 14 additions and 2 deletions
|
|
@ -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))))
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue