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

[André Spiegel]

Index: emacs/lisp/vc-rcs.el
diff -c emacs/lisp/vc-rcs.el:1.39 emacs/lisp/vc-rcs.el:1.40
*** emacs/lisp/vc-rcs.el:1.39   Sun Mar 21 15:46:23 2004
--- emacs/lisp/vc-rcs.el        Fri Jul  2 07:26:21 2004
***************
*** 5,11 ****
  ;; Author:     FSF (see vc.el for full credits)
  ;; Maintainer: Andre Spiegel <address@hidden>
  
! ;; $Id: vc-rcs.el,v 1.39 2004/03/21 15:46:23 spiegel 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-rcs.el,v 1.40 2004/07/02 07:26:21 spiegel Exp $
  
  ;; This file is part of GNU Emacs.
  
***************
*** 198,207 ****
  
  (defun vc-rcs-checkout-model (file)
    "RCS-specific version of `vc-checkout-model'."
!   (vc-rcs-consult-headers file)
!   (or (vc-file-getprop file 'vc-checkout-model)
!       (progn (vc-rcs-fetch-master-state file)
!            (vc-file-getprop file 'vc-checkout-model))))
  
  (defun vc-rcs-workfile-unchanged-p (file)
    "RCS-specific implementation of vc-workfile-unchanged-p."
--- 198,211 ----
  
  (defun vc-rcs-checkout-model (file)
    "RCS-specific version of `vc-checkout-model'."
!   (let (result)
!     (when vc-consult-headers
!       (vc-file-setprop file 'vc-checkout-model nil)
!       (vc-rcs-consult-headers file)
!       (setq result (vc-file-getprop file 'vc-checkout-model)))
!     (or result
!         (progn (vc-rcs-fetch-master-state file)
!                (vc-file-getprop file 'vc-checkout-model)))))
  
  (defun vc-rcs-workfile-unchanged-p (file)
    "RCS-specific implementation of vc-workfile-unchanged-p."