diff options
| author | André Spiegel <spiegel@gnu.org> | 2004-07-02 07:26:21 +0000 |
|---|---|---|
| committer | André Spiegel <spiegel@gnu.org> | 2004-07-02 07:26:21 +0000 |
| commit | 8915c22048d2af566b82794c0b9a59a26e24f533 (patch) | |
| tree | 75a4530137ac7472d62e9fdba589273bcd956a18 /lisp | |
| parent | 5dc0a68b4253e2f1d247ad62ad5f1165dddf10a0 (diff) | |
| download | emacs-8915c22048d2af566b82794c0b9a59a26e24f533.tar.gz | |
(vc-rcs-checkout-model): Look at the version headers only if
vc-consult-headers is non-nil.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/vc-rcs.el | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/lisp/vc-rcs.el b/lisp/vc-rcs.el index 02dc093ed5a..ca2958756a4 100644 --- a/lisp/vc-rcs.el +++ b/lisp/vc-rcs.el @@ -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 @@ When VERSION is given, perform check for that version." (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." |