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

[Andre Spiegel]

Index: emacs/lisp/vc-cvs.el
diff -c emacs/lisp/vc-cvs.el:1.27 emacs/lisp/vc-cvs.el:1.28
*** emacs/lisp/vc-cvs.el:1.27   Sun Nov 25 18:52:51 2001
--- emacs/lisp/vc-cvs.el        Fri Nov 30 08:47:39 2001
***************
*** 5,11 ****
  ;; Author:      FSF (see vc.el for full credits)
  ;; Maintainer:  Andre Spiegel <address@hidden>
  
! ;; $Id: vc-cvs.el,v 1.27 2001/11/25 23:52:51 monnier 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.28 2001/11/30 13:47:39 spiegel Exp $
  
  ;; This file is part of GNU Emacs.
  
***************
*** 693,711 ****
              (setq status (match-string 1)))
            (if (and full
                     (re-search-forward
!                   "\\(RCS Version\\|RCS Revision\\|Repository revision\\):\
  \[\t ]+\\([0-9.]+\\)"
                      nil t))
                (vc-file-setprop file 'vc-latest-version (match-string 2)))
!           (cond
!            ((string-match "Up-to-date" status)
!             (vc-file-setprop file 'vc-checkout-time
!                              (nth 5 (file-attributes file)))
!             'up-to-date)
!            ((string-match "Locally Modified"    status) 'edited)
!          ((string-match "Needs Merge"         status) 'needs-merge)
!          ((string-match "Needs \\(Checkout\\|Patch\\)" status) 'needs-patch)
!          (t 'edited)))))))
  
  (defun vc-cvs-dir-state-heuristic (dir)
    "Find the CVS state of all files in DIR, using only local information."
--- 693,713 ----
              (setq status (match-string 1)))
            (if (and full
                     (re-search-forward
!                     "\\(RCS Version\\|RCS Revision\\|Repository revision\\):\
  \[\t ]+\\([0-9.]+\\)"
                      nil t))
                (vc-file-setprop file 'vc-latest-version (match-string 2)))
!           (vc-file-setprop 
!            file 'vc-state
!            (cond
!             ((string-match "Up-to-date" status)
!              (vc-file-setprop file 'vc-checkout-time
!                               (nth 5 (file-attributes file)))
!              'up-to-date)
!             ((string-match "Locally Modified" status)             'edited)
!             ((string-match "Needs Merge" status)                  
'needs-merge)
!             ((string-match "Needs \\(Checkout\\|Patch\\)" status) 
'needs-patch)
!             (t 'edited))))))))
  
  (defun vc-cvs-dir-state-heuristic (dir)
    "Find the CVS state of all files in DIR, using only local information."