[Emacs-diffs] Changes to emacs/lisp/vc-cvs.el

[Stefan Monnier]

Index: emacs/lisp/vc-cvs.el
diff -c emacs/lisp/vc-cvs.el:1.36 emacs/lisp/vc-cvs.el:1.37
*** emacs/lisp/vc-cvs.el:1.36   Mon Mar 18 12:19:45 2002
--- emacs/lisp/vc-cvs.el        Fri Mar 22 18:10:01 2002
***************
*** 5,11 ****
  ;; Author:      FSF (see vc.el for full credits)
  ;; Maintainer:  Andre Spiegel <address@hidden>
  
! ;; $Id: vc-cvs.el,v 1.36 2002/03/18 17:19:45 spiegel Exp $
  
  ;; This file is part of GNU Emacs.
  
--- 5,11 ----
  ;; Author:      FSF (see vc.el for full credits)
  ;; Maintainer:  Andre Spiegel <address@hidden>
  
! ;; $Id: vc-cvs.el,v 1.37 2002/03/22 23:10:01 monnier Exp $
  
  ;; This file is part of GNU Emacs.
  
***************
*** 163,169 ****
            (goto-char (point-min))
          (cond
           ((re-search-forward
!            (concat "^/" (regexp-quote basename) "/") nil t)
            (beginning-of-line)
            (vc-cvs-parse-entry file)
            t)
--- 163,170 ----
            (goto-char (point-min))
          (cond
           ((re-search-forward
!            ;; 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,784 ****
      (vc-insert-file (expand-file-name "CVS/Entries" dir))
      (goto-char (point-min))
      (while (not (eobp))
!       (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))))
--- 779,786 ----
      (vc-insert-file (expand-file-name "CVS/Entries" dir))
      (goto-char (point-min))
      (while (not (eobp))
!       ;; 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,877 ****
             "\\(.\\|\\)" ;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-cvs-parse-sticky-tag (match-string 5) (match-string 
6)))
      ;; compare checkout time and modification time
      (let ((mtime (nth 5 (file-attributes file)))
--- 873,879 ----
             "\\(.\\|\\)" ;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-cvs-parse-sticky-tag (match-string 5) (match-string 
6)))
      ;; compare checkout time and modification time
      (let ((mtime (nth 5 (file-attributes file)))