diff options
| author | Juanma Barranquero <lekktu@gmail.com> | 2003-02-05 23:13:21 +0000 |
|---|---|---|
| committer | Juanma Barranquero <lekktu@gmail.com> | 2003-02-05 23:13:21 +0000 |
| commit | bf142f280fcd825fb18054b1c5981fbb28ed3ce3 (patch) | |
| tree | e0874d82169d3c35ca095a89c1ae9e9ce60b1012 /lisp | |
| parent | 17874c4eb9e60b15cb6fd0193ce44d220f73ef03 (diff) | |
| download | emacs-bf142f280fcd825fb18054b1c5981fbb28ed3ce3.tar.gz emacs-bf142f280fcd825fb18054b1c5981fbb28ed3ce3.tar.bz2 emacs-bf142f280fcd825fb18054b1c5981fbb28ed3ce3.zip | |
(vc-annotate-display, vc-checkout-carefully): Add obsolescence declaration and
remove redundant info from docstring.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/vc.el | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/lisp/vc.el b/lisp/vc.el index 3b7074df6a7..ddf67fc48bf 100644 --- a/lisp/vc.el +++ b/lisp/vc.el @@ -6,7 +6,7 @@ ;; Maintainer: Andre Spiegel <spiegel@gnu.org> ;; Keywords: tools -;; $Id: vc.el,v 1.347 2002/12/26 14:04:21 spiegel Exp $ +;; $Id: vc.el,v 1.348 2003/02/04 12:12:09 lektu Exp $ ;; This file is part of GNU Emacs. @@ -645,15 +645,14 @@ is sensitive to blank lines." :group 'vc) (defcustom vc-checkout-carefully (= (user-uid) 0) - "*This variable is obsolete -The corresponding checks are always done now. -From the old doc string: - -Non-nil means be extra-careful in checkout. + "*Non-nil means be extra-careful in checkout. Verify that the file really is not locked and that its contents match what the master file says." :type 'boolean :group 'vc) +(make-obsolete-variable 'vc-checkout-carefully + "the corresponding checks are always done now." + "21.1") ;; The main keymap @@ -3133,14 +3132,12 @@ or OFFSET if present." (defun vc-annotate-display (&optional color-map offset) "Highlight `vc-annotate' output in the current buffer. COLOR-MAP, if present, overrides `vc-annotate-color-map'. -The annotations are relative to the current time, unless overridden by OFFSET. - -This function is obsolete, and has been replaced by -`vc-annotate-display-select'." +The annotations are relative to the current time, unless overridden by OFFSET." (if (and color-map (not (eq color-map vc-annotate-color-map))) (set (make-local-variable 'vc-annotate-color-map) color-map)) (set (make-local-variable 'vc-annotate-offset) offset) (font-lock-mode 1)) +(make-obsolete 'vc-annotate-display 'vc-annotate-display-select "21.4") (defvar vc-annotate-offset nil) |