comparison lisp/vc.el @ 83228:2a3f27a45698

Merged in changes from CVS trunk. Patches applied: * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-694 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-695 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-696 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-697 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-698 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-699 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-700 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-701 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-702 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-703 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-704 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-705 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-706 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-707 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-708 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-709 Update from CVS: src/indent.c (Fvertical_motion): Fix last change. * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-710 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-711 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-712 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-713 Update from CVS * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-72 Update from CVS * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-73 Merge from emacs--cvs-trunk--0 git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-268
author Karoly Lorentey <lorentey@elte.hu>
date Mon, 22 Nov 2004 11:06:39 +0000
parents 7a0245dd1848 f398ebfc07e2
children 549734260e34
comparison
equal deleted inserted replaced
83227:3ec251523b3e 83228:2a3f27a45698
319 ;; Insert the diff for all files at and below DIR into the *vc-diff* 319 ;; Insert the diff for all files at and below DIR into the *vc-diff*
320 ;; buffer. The meaning of REV1 and REV2 is the same as for 320 ;; buffer. The meaning of REV1 and REV2 is the same as for
321 ;; vc-BACKEND-diff. The default implementation does an explicit tree 321 ;; vc-BACKEND-diff. The default implementation does an explicit tree
322 ;; walk, calling vc-BACKEND-diff for each individual file. 322 ;; walk, calling vc-BACKEND-diff for each individual file.
323 ;; 323 ;;
324 ;; - annotate-command (file buf rev) 324 ;; - annotate-command (file buf &optional rev)
325 ;; 325 ;;
326 ;; If this function is provided, it should produce an annotated version 326 ;; If this function is provided, it should produce an annotated display
327 ;; of FILE in BUF, relative to version REV. This is currently only 327 ;; of FILE in BUF, relative to version REV. Annotation means each line
328 ;; implemented for CVS, using the `cvs annotate' command. 328 ;; of FILE displayed is prefixed with version information associated with
329 ;; its addition (deleted lines leave no history) and that the text of the
330 ;; file is fontified according to age.
329 ;; 331 ;;
330 ;; - annotate-time () 332 ;; - annotate-time ()
331 ;; 333 ;;
332 ;; Only required if `annotate-command' is defined for the backend. 334 ;; Only required if `annotate-command' is defined for the backend.
333 ;; Return the time of the next line of annotation at or after point, 335 ;; Return the time of the next line of annotation at or after point,
643 "*Menu elements for the mode-specific menu of VC-Annotate mode. 645 "*Menu elements for the mode-specific menu of VC-Annotate mode.
644 List of factors, used to expand/compress the time scale. See `vc-annotate'." 646 List of factors, used to expand/compress the time scale. See `vc-annotate'."
645 :type '(repeat number) 647 :type '(repeat number)
646 :group 'vc) 648 :group 'vc)
647 649
648 ;; vc-annotate functionality (CVS only).
649 (defvar vc-annotate-mode-map 650 (defvar vc-annotate-mode-map
650 (let ((m (make-sparse-keymap))) 651 (let ((m (make-sparse-keymap)))
651 (define-key m [menu-bar] (make-sparse-keymap "VC-Annotate")) 652 (define-key m [menu-bar] (make-sparse-keymap "VC-Annotate"))
652 m) 653 m)
653 "Local keymap used for VC-Annotate mode.") 654 "Local keymap used for VC-Annotate mode.")