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

[Eric S. Raymond]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Eric S. Raymond <esr>   07/12/28 16:24:32

Index: vc-cvs.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/vc-cvs.el,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -b -r1.99 -r1.100
--- vc-cvs.el   28 Dec 2007 08:59:49 -0000      1.99
+++ vc-cvs.el   28 Dec 2007 16:24:31 -0000      1.100
@@ -285,9 +285,8 @@
     (cond ((eq cvs-state 'edited)
           (if (equal (vc-working-revision file) "0")
               "(added)" "(modified)"))
-         ((eq cvs-state 'needs-patch) "(patch)")
-         ((eq cvs-state 'needs-merge) "(merge)"))))
-
+         (t
+          (vc-default-dired-state-info 'CVS file)))))
 
 ;;;
 ;;; State-changing functions