summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Love <fx@gnu.org>1998-06-02 13:21:13 +0000
committerDave Love <fx@gnu.org>1998-06-02 13:21:13 +0000
commite2f584bbdf5d8d3cad8edda57910dae6f9577145 (patch)
treea781b728aa01a33a92ef47ba7ed91bd6d4efaca9
parent758812eb2da15fb314554cc210ccc2d487b2e625 (diff)
downloademacs-e2f584bbdf5d8d3cad8edda57910dae6f9577145.tar.gz
(normal-top-level-add-subdirs-to-load-path): Ignore
CVS directories too.
-rw-r--r--lisp/startup.el6
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/startup.el b/lisp/startup.el
index 9aef3420dce..55a05fb6083 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -339,8 +339,8 @@ from being initialized."
(defun normal-top-level-add-subdirs-to-load-path ()
"Add all subdirectories of current directory to `load-path'.
More precisely, this uses only the subdirectories whose names
-start with letters or digits; it excludes any subdirectory named`RCS',
-and any subdirectory that contains a file named `.nosearch'."
+start with letters or digits; it excludes any subdirectory named `RCS'
+or `CVS', and any subdirectory that contains a file named `.nosearch'."
(let (dirs
(pending (list default-directory)))
;; This loop does a breadth-first tree walk on DIR's subtree,
@@ -351,7 +351,7 @@ and any subdirectory that contains a file named `.nosearch'."
(let ((contents (directory-files (car dirs)))
(default-directory (car dirs)))
(while contents
- (unless (member (car contents) '("." ".." "RCS"))
+ (unless (member (car contents) '("." ".." "RCS" "CVS"))
(when (and (string-match "\\`[a-zA-Z0-9]" (car contents))
(file-directory-p (car contents)))
(let ((expanded (expand-file-name (car contents))))