rgrep ignored file tweak

* lisp/progmodes/grep.el (rgrep): Tweak the find command line so
that directories matching `grep-find-ignored-files' won't be
pruned.

Fixes: debbugs:10351

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 205d6d0be99b0920b768770d4061d013a69bbb91..a3a633c86fe374fb3f64cf817ec017748ffcb51f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2011-12-20  Wolfgang Jenkner  <wjenkner@inode.at>
+
+       * lisp/progmodes/grep.el (rgrep): Tweak the find command line so
+       that directories matching `grep-find-ignored-files' won't be
+       pruned (bug#10351).
+
 2012-04-11  Chong Yidong  <cyd@gnu.org>
 
        * startup.el (command-line): Remove support for long-obsolete

diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index d41364547f2d7ec85d68a41c9be80c6ea7650cfd..569e864a1c687f56b44e0916a2ed74050c6e1bf6 100644 (file)
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -1024,7 +1024,8 @@ to specify a command to run."
                                    (shell-quote-argument ")")
                                    " -prune -o "))
                       (and grep-find-ignored-files
-                           (concat (shell-quote-argument "(")
+                           (concat (shell-quote-argument "!") " -type d "
+                                   (shell-quote-argument "(")
                                    ;; we should use shell-quote-argument here
                                    " -name "
                                    (mapconcat