diff options
author | Dmitry Gutov <dgutov@yandex.ru> | 2016-05-04 01:02:43 +0300 |
---|---|---|
committer | Dmitry Gutov <dgutov@yandex.ru> | 2016-05-04 01:02:43 +0300 |
commit | 6428aa044ad872e9b8b60d825b7cbcb38ae3e492 (patch) | |
tree | a96a2dee81058a638724258c0ac1fb21d354c47e /lisp/dired-aux.el | |
parent | 6f82d8ef7d3aea2d05677d2792f89b8e6084d66a (diff) | |
download | emacs-6428aa044ad872e9b8b60d825b7cbcb38ae3e492.tar.gz |
Use grep-find-ignored-directories instead of vc-directory-exclusion-list
* lisp/dired-aux.el (dired-do-find-regexp):
Use grep-find-ignored-directories instead of
vc-directory-exclusion-list. The result should be functionally
similar (the former uses the latter as the default value), but it
should be more consistent and appropriate WRT user
customizations.
(dired-do-find-regexp-and-replace): Update the docstring.
* lisp/dired.el: Update the corresponding autoloads.
* doc/emacs/dired.texi (Operating on Files): Update the
documentation accordingly.
Diffstat (limited to 'lisp/dired-aux.el')
-rw-r--r-- | lisp/dired-aux.el | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el index 5ee3c118cb1..b9111a8d5b4 100644 --- a/lisp/dired-aux.el +++ b/lisp/dired-aux.el @@ -2722,17 +2722,18 @@ with the command \\[tags-loop-continue]." "Find all matches for REGEXP in all marked files. For any marked directory, all of its files are searched recursively. However, files matching `grep-find-ignored-files' and subdirectories -matching `vc-directory-exclusion-list' are skipped in the marked +matching `grep-find-ignored-directories' are skipped in the marked directories. REGEXP should use constructs supported by your local `grep' command." (interactive "sSearch marked files (regexp): ") (require 'grep) (defvar grep-find-ignored-files) + (defvar grep-find-ignored-directories) (let* ((files (dired-get-marked-files)) (ignores (nconc (mapcar (lambda (s) (concat s "/")) - vc-directory-exclusion-list) + grep-find-ignored-directories) grep-find-ignored-files)) (xrefs (cl-mapcan (lambda (file) @@ -2749,7 +2750,7 @@ REGEXP should use constructs supported by your local `grep' command." "Replace matches of FROM with TO, in all marked files. For any marked directory, matches in all of its files are replaced, recursively. However, files matching `grep-find-ignored-files' -and subdirectories matching `vc-directory-exclusion-list' are skipped +and subdirectories matching `grep-find-ignored-directories' are skipped in the marked directories. REGEXP should use constructs supported by your local `grep' command." |