[Emacs-diffs] /srv/bzr/emacs/trunk r107867: rgrep ignored file tweak

[Lars Magne Ingebrigtsen]

------------------------------------------------------------
revno: 107867
fixes bug(s): http://debbugs.gnu.org/10351
author: Wolfgang Jenkner <address@hidden>
committer: Lars Magne Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Wed 2012-04-11 13:39:35 +0200
message:
  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.
modified:
  lisp/ChangeLog
  lisp/progmodes/grep.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-04-11 05:43:47 +0000
+++ b/lisp/ChangeLog    2012-04-11 11:39:35 +0000
@@ -1,3 +1,9 @@
+2011-12-20  Wolfgang Jenkner  <address@hidden>
+
+       * 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  <address@hidden>
 
        * startup.el (command-line): Remove support for long-obsolete

=== modified file 'lisp/progmodes/grep.el'
--- a/lisp/progmodes/grep.el    2012-04-09 13:05:48 +0000
+++ b/lisp/progmodes/grep.el    2012-04-11 11:39:35 +0000
@@ -1024,7 +1024,8 @@
                                    (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