[Emacs-diffs] Changes to emacs/lisp/vc.el

[Juanma Barranquero]

Index: emacs/lisp/vc.el
diff -c emacs/lisp/vc.el:1.348 emacs/lisp/vc.el:1.349
*** emacs/lisp/vc.el:1.348      Tue Feb  4 07:12:09 2003
--- emacs/lisp/vc.el    Wed Feb  5 18:13:21 2003
***************
*** 6,12 ****
  ;; Maintainer: Andre Spiegel <address@hidden>
  ;; Keywords: tools
  
! ;; $Id: vc.el,v 1.348 2003/02/04 12:12:09 lektu Exp $
  
  ;; This file is part of GNU Emacs.
  
--- 6,12 ----
  ;; Maintainer: Andre Spiegel <address@hidden>
  ;; Keywords: tools
  
! ;; $Id: vc.el,v 1.349 2003/02/05 23:13:21 lektu Exp $
  
  ;; This file is part of GNU Emacs.
  
***************
*** 645,659 ****
    :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.
  Verify that the file really is not locked
  and that its contents match what the master file says."
    :type 'boolean
    :group 'vc)
  
  
  ;; The main keymap
--- 645,658 ----
    :group 'vc)
  
  (defcustom vc-checkout-carefully (= (user-uid) 0)
!   "*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,3146 ****
  (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'."
    (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))
  
  (defvar vc-annotate-offset nil)
  
--- 3132,3143 ----
  (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."
    (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)