summaryrefslogtreecommitdiff
path: root/lisp/vc-cvs.el
diff options
context:
space:
mode:
authorEric S. Raymond <esr@snark.thyrsus.com>2007-12-28 16:24:31 +0000
committerEric S. Raymond <esr@snark.thyrsus.com>2007-12-28 16:24:31 +0000
commit0f67cc71b4047fd71b873a4e73644a097722869c (patch)
treec041d8637e21d51ae029fb69c4edb02758a712a3 /lisp/vc-cvs.el
parent5b7ec6a8137672e5c42527a604897d16ad78cdb6 (diff)
downloademacs-0f67cc71b4047fd71b873a4e73644a097722869c.tar.gz
* vc-cvs.el, vc-svn.el: Simplify backend dired-state-info
functions so they don't do work that the default one can do instead
Diffstat (limited to 'lisp/vc-cvs.el')
-rw-r--r--lisp/vc-cvs.el5
1 files changed, 2 insertions, 3 deletions
diff --git a/lisp/vc-cvs.el b/lisp/vc-cvs.el
index f5c86d4ead8..3728d725478 100644
--- a/lisp/vc-cvs.el
+++ b/lisp/vc-cvs.el
@@ -285,9 +285,8 @@ committed and support display of sticky tags."
(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