mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-02-06 20:49:33 +00:00
Code Issues Releases Activity

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

Browse Source
This commit is contained in:
Sam Steingold 2008-06-05 18:52:48 +00:00
parent 87478b52f9
commit 1d1d90d624
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lisp/ChangeLog
View File

@ -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)

20
lisp/vc-cvs.el
View File

@ -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)