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

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        08/05/30 16:21:49

Index: vc-cvs.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/vc-cvs.el,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -b -r1.137 -r1.138
--- vc-cvs.el   26 May 2008 23:50:20 -0000      1.137
+++ vc-cvs.el   30 May 2008 16:21:49 -0000      1.138
@@ -231,6 +231,7 @@
     (cond
      ((equal checkout-time lastmod) 'up-to-date)
      ((string= (vc-working-revision file) "0") 'added)
+     ((null checkout-time) 'unregistered)
      (t 'edited))))
 
 (defun vc-cvs-working-revision (file)
@@ -800,9 +801,8 @@
        ((re-search-forward "\\=\\([^ \t]+\\)" nil t)
        (setq file (expand-file-name (match-string 1)))
        (vc-file-setprop file 'vc-backend 'CVS)
-       (if (not (re-search-forward "\\=[ \t]+Status: \\(.*\\)" nil t))
-           (setq status "Unknown")
-         (setq status (match-string 1)))
+       (setq status(if (re-search-forward "\\=[ \t]+Status: \\(.*\\)" nil t)
+                        (match-string 1) "Unknown"))
        (when (and full
                   (re-search-forward
                    "\\(RCS Version\\|RCS Revision\\|Repository revision\\):\
@@ -823,6 +823,7 @@
          ((string-match "Locally Added" status)                'added)
          ((string-match "Locally Removed" status)              'removed)
          ((string-match "File had conflicts " status)          'conflict)
+          ((string-match "Unknown" status)                     'unregistered)
          (t 'edited))))))))
 
 (defun vc-cvs-after-dir-status (update-function)