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

[Andre Spiegel]

Index: emacs/lisp/vc-hooks.el
diff -c emacs/lisp/vc-hooks.el:1.136 emacs/lisp/vc-hooks.el:1.137
*** emacs/lisp/vc-hooks.el:1.136        Tue Dec 11 02:35:18 2001
--- emacs/lisp/vc-hooks.el      Fri Dec 14 02:58:33 2001
***************
*** 5,11 ****
  ;; Author:     FSF (see vc.el for full credits)
  ;; Maintainer: Andre Spiegel <address@hidden>
  
! ;; $Id: vc-hooks.el,v 1.136 2001/12/11 07:35:18 pj Exp $
  
  ;; This file is part of GNU Emacs.
  
--- 5,11 ----
  ;; Author:     FSF (see vc.el for full credits)
  ;; Maintainer: Andre Spiegel <address@hidden>
  
! ;; $Id: vc-hooks.el,v 1.137 2001/12/14 07:58:33 spiegel Exp $
  
  ;; This file is part of GNU Emacs.
  
***************
*** 304,324 ****
  (defun vc-checkout-model (file)
    "Indicate how FILE is checked out.
  
! Possible values:
  
!   'implicit   File is always writeable, and checked out `implicitly'
                when the user saves the first changes to the file.
  
!   'locking    File is read-only if up-to-date; user must type
                \\[vc-toggle-read-only] before editing.  Strict locking
                is assumed.
  
!   'announce   File is read-only if up-to-date; user must type
                \\[vc-toggle-read-only] before editing.  But other users
                may be editing at the same time."
    (or (vc-file-getprop file 'vc-checkout-model)
!       (vc-file-setprop file 'vc-checkout-model
!                        (vc-call checkout-model file))))
  
  (defun vc-user-login-name (&optional uid)
    "Return the name under which the user is logged in, as a string.
--- 304,326 ----
  (defun vc-checkout-model (file)
    "Indicate how FILE is checked out.
  
! If FILE is not registered, this function always returns nil.
! For registered files, the possible values are:
  
!   'implicit   FILE is always writeable, and checked out `implicitly'
                when the user saves the first changes to the file.
  
!   'locking    FILE is read-only if up-to-date; user must type
                \\[vc-toggle-read-only] before editing.  Strict locking
                is assumed.
  
!   'announce   FILE is read-only if up-to-date; user must type
                \\[vc-toggle-read-only] before editing.  But other users
                may be editing at the same time."
    (or (vc-file-getprop file 'vc-checkout-model)
!       (if (vc-backend file)
!           (vc-file-setprop file 'vc-checkout-model
!                            (vc-call checkout-model file)))))
  
  (defun vc-user-login-name (&optional uid)
    "Return the name under which the user is logged in, as a string.
***************
*** 332,338 ****
  (defun vc-state (file)
    "Return the version control state of FILE.
  
! The value returned is one of:
  
    'up-to-date        The working file is unmodified with respect to the
                       latest version on the current branch, and not locked.
--- 334,341 ----
  (defun vc-state (file)
    "Return the version control state of FILE.
  
! If FILE is not registered, this function always returns nil.
! For registered files, the value returned is one of:
  
    'up-to-date        The working file is unmodified with respect to the
                       latest version on the current branch, and not locked.
***************
*** 360,367 ****
                       should be resolved by the user (vc-next-action will
                       prompt the user to do it)."
    (or (vc-file-getprop file 'vc-state)
!       (vc-file-setprop file 'vc-state
!                      (vc-call state-heuristic file))))
  
  (defsubst vc-up-to-date-p (file)
    "Convenience function that checks whether `vc-state' of FILE is 
`up-to-date'."
--- 363,371 ----
                       should be resolved by the user (vc-next-action will
                       prompt the user to do it)."
    (or (vc-file-getprop file 'vc-state)
!       (if (vc-backend file)
!           (vc-file-setprop file 'vc-state
!                            (vc-call state-heuristic file)))))
  
  (defsubst vc-up-to-date-p (file)
    "Convenience function that checks whether `vc-state' of FILE is 
`up-to-date'."
***************
*** 374,383 ****
     (vc-call-backend backend 'state file))
  
  (defun vc-workfile-version (file)
!   "Return version level of the current workfile FILE."
    (or (vc-file-getprop file 'vc-workfile-version)
!       (vc-file-setprop file 'vc-workfile-version
!                        (vc-call workfile-version file))))
  
  ;;; actual version-control code starts here
  
--- 378,389 ----
     (vc-call-backend backend 'state file))
  
  (defun vc-workfile-version (file)
!   "Return the version level of the current workfile FILE.
! If FILE is not registered, this function always returns nil."
    (or (vc-file-getprop file 'vc-workfile-version)
!       (if (vc-backend file)
!           (vc-file-setprop file 'vc-workfile-version
!                            (vc-call workfile-version file)))))
  
  ;;; actual version-control code starts here
  
***************
*** 412,419 ****
        (if (consp result) (car result) result)))))
  
  (defun vc-check-master-templates (file templates)
!   "Return non-nil if there is a master corresponding to FILE,
! according to any of the elements in TEMPLATES.
  
  TEMPLATES is a list of strings or functions.  If an element is a
  string, it must be a control string as required by `format', with two
--- 418,424 ----
        (if (consp result) (car result) result)))))
  
  (defun vc-check-master-templates (file templates)
!   "Return non-nil if there is a master corresponding to FILE.
  
  TEMPLATES is a list of strings or functions.  If an element is a
  string, it must be a control string as required by `format', with two
***************
*** 463,469 ****
  (define-key global-map "\C-x\C-q" 'vc-toggle-read-only)
  
  (defun vc-default-make-version-backups-p (backend file)
!   "Return non-nil if unmodified repository versions should be backed up 
locally.
  The default is to switch off this feature."
    nil)
  
--- 468,474 ----
  (define-key global-map "\C-x\C-q" 'vc-toggle-read-only)
  
  (defun vc-default-make-version-backups-p (backend file)
!   "Return non-nil if unmodified versions should be backed up locally.
  The default is to switch off this feature."
    nil)