pestctrl/emacs
1
0
Fork 0
forked from Github/emacs
Code Issues Pull requests Projects Releases Packages Wiki Activity

* lisp/progmodes/grep.el (rgrep): Handle the case when `grep-find-command'

Browse source 
is a cons cell.

Fixes: debbugs:9278
This commit is contained in:
Juri Linkov 2011-08-17 20:11:49 +03:00
parent 35774242f9
commit 02b404de99
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2011-08-17 Juri Linkov <juri@jurta.org>
* progmodes/grep.el (rgrep): Handle the case when
`grep-find-command' is a cons cell (bug#9278).
2011-08-17 Martin Rudalics <rudalics@gmx.at>
* window.el (display-buffer-pop-up-frame): Run frame creation

4
lisp/progmodes/grep.el
View file

@ -965,7 +965,9 @@ This command shares argument histories with \\[lgrep] and \\[grep-find]."
(unless (and dir (file-directory-p dir) (file-readable-p dir))
(setq dir default-directory))
(if (null files)
(if (not (string= regexp grep-find-command))
(if (not (string= regexp (if (consp grep-find-command)
(car grep-find-command)
grep-find-command)))
(compilation-start regexp 'grep-mode))
(setq dir (file-name-as-directory (expand-file-name dir)))
(require 'find-dired) ; for `find-name-arg'