diff options
| author | Eric S. Raymond | 2008-01-02 23:47:35 +0000 |
|---|---|---|
| committer | Eric S. Raymond | 2008-01-02 23:47:35 +0000 |
| commit | 1f0bee0a2d7c6254e87d169ee8c1bead6674247e (patch) | |
| tree | a295a730c1439f26ae849c05e3c6bea6b402b91a | |
| parent | aab2236f2de3219864725b31c60d07473a844c85 (diff) | |
| download | emacs-1f0bee0a2d7c6254e87d169ee8c1bead6674247e.tar.gz emacs-1f0bee0a2d7c6254e87d169ee8c1bead6674247e.zip | |
* progmodes/grep.el (grep-find-ignored-directories): Initialize
from the value of vc-directory-exclusion-list.
* vc-hooks (vc-directory-exclusion-list): Include "_darcs",
even though we don't have a back end for darcs yet.
| -rw-r--r-- | lisp/ChangeLog | 8 | ||||
| -rw-r--r-- | lisp/progmodes/grep.el | 10 | ||||
| -rw-r--r-- | lisp/vc-hooks.el | 3 |
3 files changed, 11 insertions, 10 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index cc089335e4b..0d2b52b5d95 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,11 @@ | |||
| 1 | 2008-01-02 Eric S. Raymond <esr@snark.thyrsus.com> | ||
| 2 | |||
| 3 | * progmodes/grep.el (grep-find-ignored-directories): Initialize | ||
| 4 | from the value of vc-directory-exclusion-list. | ||
| 5 | |||
| 6 | * vc-hooks (vc-directory-exclusion-list): Include "_darcs", | ||
| 7 | even though we don't have a back end for darcs yet. | ||
| 8 | |||
| 1 | 2008-01-02 Karl Fogel <kfogel@red-bean.com> | 9 | 2008-01-02 Karl Fogel <kfogel@red-bean.com> |
| 2 | 10 | ||
| 3 | Change a return type, for greater extensibility. See | 11 | Change a return type, for greater extensibility. See |
diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el index 062fce4c346..101e8f12e3f 100644 --- a/lisp/progmodes/grep.el +++ b/lisp/progmodes/grep.el | |||
| @@ -158,15 +158,7 @@ The following place holders should be present in the string: | |||
| 158 | :group 'grep) | 158 | :group 'grep) |
| 159 | 159 | ||
| 160 | (defcustom grep-find-ignored-directories | 160 | (defcustom grep-find-ignored-directories |
| 161 | '(".bzr" | 161 | vc-directory-exclusion-list |
| 162 | ".git" | ||
| 163 | ".hg" | ||
| 164 | ".svn" | ||
| 165 | "CVS" | ||
| 166 | "RCS" | ||
| 167 | "_MTN" | ||
| 168 | "_darcs" | ||
| 169 | "{arch}") | ||
| 170 | "*List of names of sub-directories which `rgrep' shall not recurse into." | 162 | "*List of names of sub-directories which `rgrep' shall not recurse into." |
| 171 | :type '(repeat string) | 163 | :type '(repeat string) |
| 172 | :group 'grep) | 164 | :group 'grep) |
diff --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el index 39550da8018..287605f338c 100644 --- a/lisp/vc-hooks.el +++ b/lisp/vc-hooks.el | |||
| @@ -76,9 +76,10 @@ An empty list disables VC altogether." | |||
| 76 | :version "23.1" | 76 | :version "23.1" |
| 77 | :group 'vc) | 77 | :group 'vc) |
| 78 | 78 | ||
| 79 | ;; Note: we don't actually have a darcs back end yet. | ||
| 79 | (defcustom vc-directory-exclusion-list '("SCCS" "RCS" "CVS" "MCVS" | 80 | (defcustom vc-directory-exclusion-list '("SCCS" "RCS" "CVS" "MCVS" |
| 80 | ".svn" ".git" ".hg" ".bzr" | 81 | ".svn" ".git" ".hg" ".bzr" |
| 81 | "_MTN" "{arch}") | 82 | "_MTN" "_darcs" "{arch}") |
| 82 | "List of directory names to be ignored when walking directory trees." | 83 | "List of directory names to be ignored when walking directory trees." |
| 83 | :type '(repeat string) | 84 | :type '(repeat string) |
| 84 | :group 'vc) | 85 | :group 'vc) |