aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/vc-rcs.el13
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 @@
5;; Author: FSF (see vc.el for full credits) 5;; Author: FSF (see vc.el for full credits)
6;; Maintainer: Andre Spiegel <spiegel@gnu.org> 6;; Maintainer: Andre Spiegel <spiegel@gnu.org>
7 7
8;; $Id: vc-rcs.el,v 1.11 2000/10/03 12:08:40 spiegel Exp $ 8;; $Id: vc-rcs.el,v 1.12 2000/11/16 18:13:16 spiegel Exp $
9 9
10;; This file is part of GNU Emacs. 10;; This file is part of GNU Emacs.
11 11
@@ -126,7 +126,9 @@ For a description of possible values, see `vc-check-master-templates'."
126 (if (eq state 'up-to-date) 126 (if (eq state 'up-to-date)
127 (if (vc-workfile-unchanged-p file) 127 (if (vc-workfile-unchanged-p file)
128 'up-to-date 128 'up-to-date
129 'unlocked-changes) 129 (if (eq (vc-checkout-model file) 'locking)
130 'unlocked-changes
131 'edited))
130 state))) 132 state)))
131 133
132(defun vc-rcs-state-heuristic (file) 134(defun vc-rcs-state-heuristic (file)
@@ -688,12 +690,7 @@ file."
688 (if (or workfile-is-latest 690 (if (or workfile-is-latest
689 (vc-rcs-latest-on-branch-p file workfile-version)) 691 (vc-rcs-latest-on-branch-p file workfile-version))
690 ;; workfile version is latest on branch 692 ;; workfile version is latest on branch
691 (if (eq (vc-checkout-model file) 'locking) 693 'up-to-date
692 'up-to-date
693 (require 'vc)
694 (if (vc-workfile-unchanged-p file)
695 'up-to-date
696 'edited))
697 ;; workfile version is not latest on branch 694 ;; workfile version is not latest on branch
698 'needs-patch)) 695 'needs-patch))
699 ;; locked by the calling user 696 ;; locked by the calling user