# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1016838601 0
# Node ID 985526b082703111b877df961089a028a63a6b1d
# Parent  f93538d761170c12a2239d9e2b77bed48655d346
(vc-cvs-registered, vc-cvs-dir-state-heuristic):
Don't consider cvs-removed files as under VC control.
VC wouldn't handle them properly anyway and it confuses
vc-file-not-found-hook.

diff -r f93538d76117 -r 985526b08270 lisp/vc-cvs.el
--- a/lisp/vc-cvs.el	Fri Mar 22 23:05:26 2002 +0000
+++ b/lisp/vc-cvs.el	Fri Mar 22 23:10:01 2002 +0000
@@ -5,7 +5,7 @@
 ;; Author:      FSF (see vc.el for full credits)
 ;; Maintainer:  Andre Spiegel <spiegel@gnu.org>
 
-;; $Id: vc-cvs.el,v 1.35 2002/03/05 13:30:50 spiegel Exp $
+;; $Id: vc-cvs.el,v 1.36 2002/03/18 17:19:45 spiegel Exp $
 
 ;; This file is part of GNU Emacs.
 
@@ -163,7 +163,8 @@
           (goto-char (point-min))
 	  (cond
 	   ((re-search-forward
-	     (concat "^/" (regexp-quote basename) "/") nil t)
+	     ;; CVS-removed files are not taken under VC control.
+	     (concat "^/" (regexp-quote basename) "/[^/-]") nil t)
 	    (beginning-of-line)
 	    (vc-cvs-parse-entry file)
 	    t)
@@ -778,7 +779,8 @@
     (vc-insert-file (expand-file-name "CVS/Entries" dir))
     (goto-char (point-min))
     (while (not (eobp))
-      (when (looking-at "/\\([^/]*\\)/")
+      ;; CVS-removed files are not taken under VC control.
+      (when (looking-at "/\\([^/]*\\)/[^/-]")
 	(let ((file (expand-file-name (match-string 1) dir)))
 	  (unless (vc-file-getprop file 'vc-state)
 	    (vc-cvs-parse-entry file t))))
@@ -871,7 +873,7 @@
 	     "\\(.\\|\\)" ;Sticky tag type (date or tag name, could be empty)
 	     "\\(.*\\)"))		;Sticky tag
     (vc-file-setprop file 'vc-workfile-version (match-string 1))
-    (vc-file-setprop file 'vc-cvs-sticky-tag 
+    (vc-file-setprop file 'vc-cvs-sticky-tag
 		     (vc-cvs-parse-sticky-tag (match-string 5) (match-string 6)))
     ;; compare checkout time and modification time
     (let ((mtime (nth 5 (file-attributes file)))