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

[Andre Spiegel]

Index: emacs/lisp/vc.el
diff -c emacs/lisp/vc.el:1.325 emacs/lisp/vc.el:1.326
*** emacs/lisp/vc.el:1.325      Sat Jan  5 12:15:20 2002
--- emacs/lisp/vc.el    Thu Feb 21 16:00:35 2002
***************
*** 6,12 ****
  ;; Maintainer: Andre Spiegel <address@hidden>
  ;; Keywords: tools
  
! ;; $Id: vc.el,v 1.325 2002/01/05 17:15:20 spiegel Exp $
  
  ;; This file is part of GNU Emacs.
  
--- 6,12 ----
  ;; Maintainer: Andre Spiegel <address@hidden>
  ;; Keywords: tools
  
! ;; $Id: vc.el,v 1.326 2002/02/21 21:00:35 spiegel Exp $
  
  ;; This file is part of GNU Emacs.
  
***************
*** 171,176 ****
--- 171,182 ----
  ;;   The implementation should pass the value of vc-register-switches
  ;;   to the backend command.
  ;;
+ ;; - init-version (file)
+ ;;
+ ;;   The initial version to use when registering FILE if one is not
+ ;;   specified by the user.  If not provided, the variable
+ ;;   vc-default-init-version is used instead.
+ ;;
  ;; - responsible-p (file)
  ;;
  ;;   Return non-nil if this backend considers itself "responsible" for
***************
*** 429,435 ****
  
  (defcustom vc-default-init-version "1.1"
    "*A string used as the default version number when a new file is registered.
! This can be overridden by giving a prefix argument to \\[vc-register]."
    :type 'string
    :group 'vc
    :version "20.3")
--- 435,442 ----
  
  (defcustom vc-default-init-version "1.1"
    "*A string used as the default version number when a new file is registered.
! This can be overridden by giving a prefix argument to \\[vc-register].  This
! can also be overridden by a particular VC backend."
    :type 'string
    :group 'vc
    :version "20.3")
***************
*** 1342,1349 ****
                    (if set-version
                        (read-string (format "Initial version level for %s: "
                                           (buffer-name)))
!                     ;; TODO: Use backend-specific init version.
!                     vc-default-init-version)
                    (or comment (not vc-initial-comment))
                  nil
                    "Enter initial comment."
--- 1349,1358 ----
                    (if set-version
                        (read-string (format "Initial version level for %s: "
                                           (buffer-name)))
!                   (let ((backend (vc-responsible-backend buffer-file-name)))
!                     (if (vc-find-backend-function backend 'init-version)
!                         (vc-call-backend backend 'init-version)
!                       vc-default-init-version)))
                    (or comment (not vc-initial-comment))
                  nil
                    "Enter initial comment."
***************
*** 1867,1875 ****
    `(append
      (if (listp diff-switches) diff-switches (list diff-switches))
      (if (listp vc-diff-switches) vc-diff-switches (list vc-diff-switches))
!     (let ((backend-switches
!            (eval (intern (concat "vc-" (symbol-name ',backend)
!                                  "-diff-switches")))))
        (if (listp backend-switches) backend-switches (list 
backend-switches)))))
  
  (defun vc-default-diff-tree (backend dir rel1 rel2)
--- 1876,1888 ----
    `(append
      (if (listp diff-switches) diff-switches (list diff-switches))
      (if (listp vc-diff-switches) vc-diff-switches (list vc-diff-switches))
!     (let* ((backend-switches-symbol
!           (intern (concat "vc-" (symbol-name ,backend)
!                           "-diff-switches")))
!          (backend-switches
!           (if (boundp backend-switches-symbol)
!               (eval backend-switches-symbol)
!             nil)))
        (if (listp backend-switches) backend-switches (list 
backend-switches)))))
  
  (defun vc-default-diff-tree (backend dir rel1 rel2)