Mercurial > emacs
changeset 95591:fff438dcde9e
(vc-cvs-registered): Consider a directory with a CVS subdirectory to be registered.
| author | Sam Steingold <sds@gnu.org> |
|---|---|
| date | Thu, 05 Jun 2008 18:52:48 +0000 |
| parents | 9a4b27c8feec |
| children | d05c87c7a8ed |
| files | lisp/ChangeLog lisp/vc-cvs.el |
| diffstat | 2 files changed, 15 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Thu Jun 05 18:00:36 2008 +0000 +++ b/lisp/ChangeLog Thu Jun 05 18:52:48 2008 +0000 @@ -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)
--- a/lisp/vc-cvs.el Thu Jun 05 18:00:36 2008 +0000 +++ b/lisp/vc-cvs.el Thu Jun 05 18:52:48 2008 +0000 @@ -196,16 +196,16 @@ ;; 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)