diff lisp/vc.el @ 83228:2a3f27a45698

Merged in changes from CVS trunk. Patches applied: * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-694 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-695 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-696 Merge from gnus--rel--5.10 * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-697 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-698 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-699 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-700 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-701 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-702 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-703 Merge from gnus--rel--5.10 * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-704 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-705 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-706 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-707 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-708 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-709 Update from CVS: src/indent.c (Fvertical_motion): Fix last change. * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-710 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-711 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-712 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-713 Update from CVS * [e-mail]--gnu-2004/gnus--rel--5.10--patch-72 Update from CVS * [e-mail]--gnu-2004/gnus--rel--5.10--patch-73 Merge from emacs--cvs-trunk--0 git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-268

--- a/lisp/vc.el	Sat Nov 13 18:34:40 2004 +0000
+++ b/lisp/vc.el	Mon Nov 22 11:06:39 2004 +0000
@@ -321,11 +321,13 @@
 ;;   vc-BACKEND-diff.  The default implementation does an explicit tree
 ;;   walk, calling vc-BACKEND-diff for each individual file.
 ;;
-;; - annotate-command (file buf rev)
+;; - annotate-command (file buf &optional rev)
 ;;
-;;   If this function is provided, it should produce an annotated version
-;;   of FILE in BUF, relative to version REV.  This is currently only
-;;   implemented for CVS, using the `cvs annotate' command.
+;;   If this function is provided, it should produce an annotated display
+;;   of FILE in BUF, relative to version REV.  Annotation means each line
+;;   of FILE displayed is prefixed with version information associated with
+;;   its addition (deleted lines leave no history) and that the text of the
+;;   file is fontified according to age.
 ;;
 ;; - annotate-time ()
 ;;
@@ -645,7 +647,6 @@
   :type '(repeat number)
   :group 'vc)
 
-;; vc-annotate functionality (CVS only).
 (defvar vc-annotate-mode-map
   (let ((m (make-sparse-keymap)))
     (define-key m [menu-bar] (make-sparse-keymap "VC-Annotate"))