(normal-top-level-add-subdirs-to-load-path): Ignore

CVS directories too.

diff --git a/lisp/startup.el b/lisp/startup.el
index 9aef3420dced3a2223e86b0e4fe9264b5f1973c2..55a05fb608399487f23ea1099b9385d9b79d9920 100644 (file)
--- 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))))