aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/progmodes
diff options
context:
space:
mode:
authorJuri Linkov2011-08-17 20:11:49 +0300
committerJuri Linkov2011-08-17 20:11:49 +0300
commit02b404de99985e6f86fe0f2e0969d281a875313e (patch)
tree0b8c5ffd49d0bb9fceb4028eb75c1873c1bdab46 /lisp/progmodes
parent35774242f9065a941c7a34acc9089647acf04b43 (diff)
downloademacs-02b404de99985e6f86fe0f2e0969d281a875313e.tar.gz
emacs-02b404de99985e6f86fe0f2e0969d281a875313e.zip
* lisp/progmodes/grep.el (rgrep): Handle the case when `grep-find-command'
is a cons cell. Fixes: debbugs:9278
Diffstat (limited to 'lisp/progmodes')
-rw-r--r--lisp/progmodes/grep.el4
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index db8e82193b3..31100f3fac2 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -965,7 +965,9 @@ This command shares argument histories with \\[lgrep] and \\[grep-find]."
965 (unless (and dir (file-directory-p dir) (file-readable-p dir)) 965 (unless (and dir (file-directory-p dir) (file-readable-p dir))
966 (setq dir default-directory)) 966 (setq dir default-directory))
967 (if (null files) 967 (if (null files)
968 (if (not (string= regexp grep-find-command)) 968 (if (not (string= regexp (if (consp grep-find-command)
969 (car grep-find-command)
970 grep-find-command)))
969 (compilation-start regexp 'grep-mode)) 971 (compilation-start regexp 'grep-mode))
970 (setq dir (file-name-as-directory (expand-file-name dir))) 972 (setq dir (file-name-as-directory (expand-file-name dir)))
971 (require 'find-dired) ; for `find-name-arg' 973 (require 'find-dired) ; for `find-name-arg'