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

[Dan Nicolaescu]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Dan Nicolaescu <dann>   08/05/31 15:24:01

Index: vc-cvs.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/vc-cvs.el,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -b -r1.138 -r1.139
--- vc-cvs.el   30 May 2008 16:21:49 -0000      1.138
+++ vc-cvs.el   31 May 2008 15:23:57 -0000      1.139
@@ -842,7 +842,7 @@
        (re-search-forward
         "\\(^=+\n\\([^=c?\n].*\n\\|\n\\)+\\)\\|\\(\\(^?? .*\n\\)+\\)\\|\\(^cvs 
status: Examining .*\n\\)"
         nil t)
-      ;; XXX: get rid of narrowing here.
+      ;; FIXME: get rid of narrowing here.
       (narrow-to-region (match-beginning 0) (match-end 0))
       (goto-char (point-min))
       ;; The subdir
@@ -855,16 +855,11 @@
        (push (list file 'unregistered) result)
        (forward-line 1))
       ;; A file entry.
-      (when (re-search-forward "^File: " nil t)
-       (when (setq missing (looking-at "no file "))
-         (goto-char (match-end 0)))
-       (cond
-        ((re-search-forward "\\=\\([^ \t]+\\)" nil t)
+      (when (re-search-forward "^File: \\(no file \\)?\\(.*[^ \t]\\)[ 
\t]+Status: \\(.*\\)" nil t)
+       (setq missing (match-string 1))
          (setq file (file-relative-name 
-                     (expand-file-name (match-string 1) subdir)))
-         (if (not (re-search-forward "\\=[ \t]+Status: \\(.*\\)" nil t))
-             (push (list file 'unregistered) result)
-           (setq status-str (match-string 1))
+                   (expand-file-name (match-string 2) subdir)))
+       (setq status-str (match-string 3))
            (setq status
                  (cond
                   ((string-match "Up-to-date" status-str) 'up-to-date)
@@ -875,9 +870,10 @@
                   ((string-match "Locally Added" status-str) 'added)
                   ((string-match "Locally Removed" status-str) 'removed)
                   ((string-match "File had conflicts " status-str) 'conflict)
+              ((string-match "Unknown" 'unregistered))
                   (t 'edited)))
            (unless (eq status 'up-to-date)
-             (push (list file status) result))))))
+         (push (list file status) result)))
       (goto-char (point-max))
       (widen))
       (funcall update-function result))