(vc-cvs-registered): Consider a directory with a CVS subdirectory to be registered.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8cbe8d8d86281477f81fe39d59d2c6dc07c19e51..dfbdb8269fe32b8cfb39a6748e4892bde208850f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-05  Sam Steingold  <sds@gnu.org>
+
+       * vc-cvs.el (vc-cvs-registered): Consider a directory with a CVS
+       subdirectory to be registered.
+
 2008-06-05  Martin Rudalics  <rudalics@gmx.at>
 
        * window.el (display-buffer-function, special-display-p)

diff --git a/lisp/vc-cvs.el b/lisp/vc-cvs.el
index 63b6794c0e12773ff6364b590dd8c3744848c552..5fc9206dec0d58f31122e3a2e2b47fe2aebd5bf8 100644 (file)
--- a/lisp/vc-cvs.el
+++ b/lisp/vc-cvs.el
@@ -196,16 +196,16 @@ See also variable `vc-cvs-sticky-date-format-string'."
         ;; make sure that the file name is searched case-sensitively
         (case-fold-search nil))
     (if (file-readable-p (expand-file-name "CVS/Entries" dirname))
-       (with-temp-buffer
-          (vc-cvs-get-entries dirname)
-          (goto-char (point-min))
-         (cond
-          ((re-search-forward
-            (concat "^/" (regexp-quote basename) "/[^/]") nil t)
-           (beginning-of-line)
-           (vc-cvs-parse-entry file)
-           t)
-          (t nil)))
+        (or (string= basename "")
+            (with-temp-buffer
+              (vc-cvs-get-entries dirname)
+              (goto-char (point-min))
+              (cond ((re-search-forward
+                      (concat "^/" (regexp-quote basename) "/[^/]") nil t)
+                     (beginning-of-line)
+                     (vc-cvs-parse-entry file)
+                     t)
+                    (t nil))))
       nil)))
 
 (defun vc-cvs-state (file)