From 1d1d90d6249c02a193fbf766ba60bdf26cc5413c Mon Sep 17 00:00:00 2001 From: Sam Steingold Date: Thu, 5 Jun 2008 18:52:48 +0000 Subject: [PATCH] (vc-cvs-registered): Consider a directory with a CVS subdirectory to be registered. --- lisp/ChangeLog | 5 +++++ lisp/vc-cvs.el | 20 ++++++++++---------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8cbe8d8d862..dfbdb8269fe 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2008-06-05 Sam Steingold + + * vc-cvs.el (vc-cvs-registered): Consider a directory with a CVS + subdirectory to be registered. + 2008-06-05 Martin Rudalics * window.el (display-buffer-function, special-display-p) diff --git a/lisp/vc-cvs.el b/lisp/vc-cvs.el index 63b6794c0e1..5fc9206dec0 100644 --- 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) -- 2.39.2