diff options
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/vc/vc-hooks.el | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 35141b6557e..12f81b76693 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2014-11-24 Sam Steingold <sds@gnu.org> | ||
| 2 | |||
| 3 | * vc/vc-hooks.el (vc-directory-exclusion-list): | ||
| 4 | Fix a trivial typo (bug#19171). | ||
| 5 | |||
| 1 | 2014-11-24 Stefan Monnier <monnier@iro.umontreal.ca> | 6 | 2014-11-24 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 7 | ||
| 3 | * vc/vc-hooks.el (vc-state-base-face): Don't override | 8 | * vc/vc-hooks.el (vc-state-base-face): Don't override |
diff --git a/lisp/vc/vc-hooks.el b/lisp/vc/vc-hooks.el index 9a277db8e0f..3a2ad40ee35 100644 --- a/lisp/vc/vc-hooks.el +++ b/lisp/vc/vc-hooks.el | |||
| @@ -124,7 +124,7 @@ An empty list disables VC altogether." | |||
| 124 | ;; Note: we don't actually have a darcs back end yet. | 124 | ;; Note: we don't actually have a darcs back end yet. |
| 125 | ;; Also, Meta-CVS (corresponding to MCVS) is unsupported. | 125 | ;; Also, Meta-CVS (corresponding to MCVS) is unsupported. |
| 126 | (defcustom vc-directory-exclusion-list (purecopy '("SCCS" "RCS" "CVS" "MCVS" | 126 | (defcustom vc-directory-exclusion-list (purecopy '("SCCS" "RCS" "CVS" "MCVS" |
| 127 | ".src", ".svn" ".git" ".hg" ".bzr" | 127 | ".src" ".svn" ".git" ".hg" ".bzr" |
| 128 | "_MTN" "_darcs" "{arch}")) | 128 | "_MTN" "_darcs" "{arch}")) |
| 129 | "List of directory names to be ignored when walking directory trees." | 129 | "List of directory names to be ignored when walking directory trees." |
| 130 | :type '(repeat string) | 130 | :type '(repeat string) |