Mercurial > emacs
comparison lisp/vc.el @ 49619:b48f8839a782
(vc-annotate-display, vc-checkout-carefully): Add obsolescence declaration and
remove redundant info from docstring.
author | Juanma Barranquero <lekktu@gmail.com> |
---|---|
date | Wed, 05 Feb 2003 23:13:21 +0000 |
parents | e88404e8f2cf |
children | f614a2396578 d7ddb3e565de |
comparison
equal
deleted
inserted
replaced
49618:a591e5af9682 | 49619:b48f8839a782 |
---|---|
4 | 4 |
5 ;; Author: FSF (see below for full credits) | 5 ;; Author: FSF (see below for full credits) |
6 ;; Maintainer: Andre Spiegel <spiegel@gnu.org> | 6 ;; Maintainer: Andre Spiegel <spiegel@gnu.org> |
7 ;; Keywords: tools | 7 ;; Keywords: tools |
8 | 8 |
9 ;; $Id: vc.el,v 1.347 2002/12/26 14:04:21 spiegel Exp $ | 9 ;; $Id: vc.el,v 1.348 2003/02/04 12:12:09 lektu Exp $ |
10 | 10 |
11 ;; This file is part of GNU Emacs. | 11 ;; This file is part of GNU Emacs. |
12 | 12 |
13 ;; GNU Emacs is free software; you can redistribute it and/or modify | 13 ;; GNU Emacs is free software; you can redistribute it and/or modify |
14 ;; it under the terms of the GNU General Public License as published by | 14 ;; it under the terms of the GNU General Public License as published by |
643 (string :tag "Comment Start") | 643 (string :tag "Comment Start") |
644 (string :tag "Comment End"))) | 644 (string :tag "Comment End"))) |
645 :group 'vc) | 645 :group 'vc) |
646 | 646 |
647 (defcustom vc-checkout-carefully (= (user-uid) 0) | 647 (defcustom vc-checkout-carefully (= (user-uid) 0) |
648 "*This variable is obsolete | 648 "*Non-nil means be extra-careful in checkout. |
649 The corresponding checks are always done now. | |
650 From the old doc string: | |
651 | |
652 Non-nil means be extra-careful in checkout. | |
653 Verify that the file really is not locked | 649 Verify that the file really is not locked |
654 and that its contents match what the master file says." | 650 and that its contents match what the master file says." |
655 :type 'boolean | 651 :type 'boolean |
656 :group 'vc) | 652 :group 'vc) |
653 (make-obsolete-variable 'vc-checkout-carefully | |
654 "the corresponding checks are always done now." | |
655 "21.1") | |
657 | 656 |
658 | 657 |
659 ;; The main keymap | 658 ;; The main keymap |
660 | 659 |
661 ;; Initialization code, to be done just once at load-time | 660 ;; Initialization code, to be done just once at load-time |
3131 (vc-annotate-convert-time (current-time))) | 3130 (vc-annotate-convert-time (current-time))) |
3132 | 3131 |
3133 (defun vc-annotate-display (&optional color-map offset) | 3132 (defun vc-annotate-display (&optional color-map offset) |
3134 "Highlight `vc-annotate' output in the current buffer. | 3133 "Highlight `vc-annotate' output in the current buffer. |
3135 COLOR-MAP, if present, overrides `vc-annotate-color-map'. | 3134 COLOR-MAP, if present, overrides `vc-annotate-color-map'. |
3136 The annotations are relative to the current time, unless overridden by OFFSET. | 3135 The annotations are relative to the current time, unless overridden by OFFSET." |
3137 | |
3138 This function is obsolete, and has been replaced by | |
3139 `vc-annotate-display-select'." | |
3140 (if (and color-map (not (eq color-map vc-annotate-color-map))) | 3136 (if (and color-map (not (eq color-map vc-annotate-color-map))) |
3141 (set (make-local-variable 'vc-annotate-color-map) color-map)) | 3137 (set (make-local-variable 'vc-annotate-color-map) color-map)) |
3142 (set (make-local-variable 'vc-annotate-offset) offset) | 3138 (set (make-local-variable 'vc-annotate-offset) offset) |
3143 (font-lock-mode 1)) | 3139 (font-lock-mode 1)) |
3140 (make-obsolete 'vc-annotate-display 'vc-annotate-display-select "21.4") | |
3144 | 3141 |
3145 (defvar vc-annotate-offset nil) | 3142 (defvar vc-annotate-offset nil) |
3146 | 3143 |
3147 (defun vc-annotate-lines (limit) | 3144 (defun vc-annotate-lines (limit) |
3148 (let (difference) | 3145 (let (difference) |