diff options
| author | André Spiegel <spiegel@gnu.org> | 2000-11-19 09:46:04 +0000 |
|---|---|---|
| committer | André Spiegel <spiegel@gnu.org> | 2000-11-19 09:46:04 +0000 |
| commit | 036f45faec1e44ffe5569160b10dde299d76dbdd (patch) | |
| tree | 56a369dc877414afa1c04f5883deb6bfde5a1b29 /lisp/vc-rcs.el | |
| parent | e5a9dabf39b361c320f891435c9ad390e9110ca7 (diff) | |
| download | emacs-036f45faec1e44ffe5569160b10dde299d76dbdd.tar.gz | |
(vc-rcs-state): Call vc-workfile-unchanged-p only here, and
differentiate according to checkout model.
(vc-rcs-fetch-master-state): Don't call vc-workfile-unchanged-p, since
this function is only concerned with master state.
Diffstat (limited to 'lisp/vc-rcs.el')
| -rw-r--r-- | lisp/vc-rcs.el | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/lisp/vc-rcs.el b/lisp/vc-rcs.el index 35c09d6335f..b636f45615c 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.11 2000/10/03 12:08:40 spiegel Exp $ +;; $Id: vc-rcs.el,v 1.12 2000/11/16 18:13:16 spiegel Exp $ ;; This file is part of GNU Emacs. @@ -126,7 +126,9 @@ For a description of possible values, see `vc-check-master-templates'." (if (eq state 'up-to-date) (if (vc-workfile-unchanged-p file) 'up-to-date - 'unlocked-changes) + (if (eq (vc-checkout-model file) 'locking) + 'unlocked-changes + 'edited)) state))) (defun vc-rcs-state-heuristic (file) @@ -688,12 +690,7 @@ file." (if (or workfile-is-latest (vc-rcs-latest-on-branch-p file workfile-version)) ;; workfile version is latest on branch - (if (eq (vc-checkout-model file) 'locking) - 'up-to-date - (require 'vc) - (if (vc-workfile-unchanged-p file) - 'up-to-date - 'edited)) + 'up-to-date ;; workfile version is not latest on branch 'needs-patch)) ;; locked by the calling user |