summaryrefslogtreecommitdiff
path: root/lisp/vc-rcs.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/vc-rcs.el')
-rw-r--r--lisp/vc-rcs.el12
1 files changed, 8 insertions, 4 deletions
diff --git a/lisp/vc-rcs.el b/lisp/vc-rcs.el
index 9b405246c29..5d020e93b6d 100644
--- a/lisp/vc-rcs.el
+++ b/lisp/vc-rcs.el
@@ -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."