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

is a cons cell.

Fixes: debbugs:9278

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f3d37a77b24420e6cde733f87917a7bea69e033a..38a463ddb58bd76b920209ca84129b69e739e51d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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

diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index db8e82193b340fdd4c5c6061350cc618d766ef8f..31100f3fac2f4db06ced43388fe23d47e7f57afc 100644 (file)
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -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'