Mercurial > emacs
changeset 56318:b9c0ed2a46bd
(vc-rcs-checkout-model): Look at the version headers only if
vc-consult-headers is non-nil.
| author | André Spiegel <spiegel@gnu.org> |
|---|---|
| date | Fri, 02 Jul 2004 07:26:21 +0000 |
| parents | 7d126dcf72aa |
| children | 18b35062b4ab |
| files | lisp/vc-rcs.el |
| diffstat | 1 files changed, 9 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/vc-rcs.el Fri Jul 02 04:38:51 2004 +0000 +++ b/lisp/vc-rcs.el Fri Jul 02 07:26:21 2004 +0000 @@ -5,7 +5,7 @@ ;; Author: FSF (see vc.el for full credits) ;; Maintainer: Andre Spiegel <spiegel@gnu.org> -;; $Id: vc-rcs.el,v 1.38 2003/09/01 15:45:17 miles Exp $ +;; $Id: vc-rcs.el,v 1.39 2004/03/21 15:46:23 spiegel Exp $ ;; This file is part of GNU Emacs. @@ -198,10 +198,14 @@ (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)))) + (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."