[Emacs-diffs] /srv/bzr/emacs/trunk r105480: * lisp/progmodes/grep.el (rgrep): Handle the case when `grep-find-command'

[Juri Linkov]

------------------------------------------------------------
revno: 105480
fixes bug(s): http://debbugs.gnu.org/9278
committer: Juri Linkov <address@hidden>
branch nick: trunk
timestamp: Wed 2011-08-17 20:11:49 +0300
message:
  * lisp/progmodes/grep.el (rgrep): Handle the case when `grep-find-command'
  is a cons cell.
modified:
  lisp/ChangeLog
  lisp/progmodes/grep.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-08-17 06:50:31 +0000
+++ b/lisp/ChangeLog    2011-08-17 17:11:49 +0000
@@ -1,3 +1,8 @@
+2011-08-17  Juri Linkov  <address@hidden>
+
+       * progmodes/grep.el (rgrep): Handle the case when
+       `grep-find-command' is a cons cell (bug#9278).
+
 2011-08-17  Martin Rudalics  <address@hidden>
 
        * window.el (display-buffer-pop-up-frame): Run frame creation

=== modified file 'lisp/progmodes/grep.el'
--- a/lisp/progmodes/grep.el    2011-08-10 18:29:31 +0000
+++ b/lisp/progmodes/grep.el    2011-08-17 17:11:49 +0000
@@ -965,7 +965,9 @@
     (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'