aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Nicolaescu2008-04-12 16:33:24 +0000
committerDan Nicolaescu2008-04-12 16:33:24 +0000
commit07d5b8c101fe83ae92a2e14dbad9044984b732fb (patch)
tree953eb8dce905b28cbd29d8d24412855a99669057
parent470fc3548e6d31ee172802c7ff3b1c97988c9ff5 (diff)
downloademacs-07d5b8c101fe83ae92a2e14dbad9044984b732fb.tar.gz
emacs-07d5b8c101fe83ae92a2e14dbad9044984b732fb.zip
(vc-cvs-registered): Allow removed files to be
considered registered.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/vc-cvs.el3
2 files changed, 6 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 763c1f3413f..dac4bdaa452 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12008-04-12 Dan Nicolaescu <dann@ics.uci.edu>
2
3 * vc-cvs.el (vc-cvs-registered): Allow removed files to be
4 considered registered.
5
12008-04-12 Reiner Steib <Reiner.Steib@gmx.de> 62008-04-12 Reiner Steib <Reiner.Steib@gmx.de>
2 7
3 * emacs-lisp/copyright.el (copyright-update-directory): New 8 * emacs-lisp/copyright.el (copyright-update-directory): New
diff --git a/lisp/vc-cvs.el b/lisp/vc-cvs.el
index 80c8e526ecd..dc60d6a1738 100644
--- a/lisp/vc-cvs.el
+++ b/lisp/vc-cvs.el
@@ -179,8 +179,7 @@ See also variable `vc-cvs-sticky-date-format-string'."
179 (goto-char (point-min)) 179 (goto-char (point-min))
180 (cond 180 (cond
181 ((re-search-forward 181 ((re-search-forward
182 ;; CVS-removed files are not taken under VC control. 182 (concat "^/" (regexp-quote basename) "/[^/]") nil t)
183 (concat "^/" (regexp-quote basename) "/[^/-]") nil t)
184 (beginning-of-line) 183 (beginning-of-line)
185 (vc-cvs-parse-entry file) 184 (vc-cvs-parse-entry file)
186 t) 185 t)