diff options
| -rw-r--r-- | lisp/vc-rcs.el | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/lisp/vc-rcs.el b/lisp/vc-rcs.el index b636f45615c..e17d0d6da27 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.12 2000/11/16 18:13:16 spiegel Exp $ | 8 | ;; $Id: vc-rcs.el,v 1.13 2000/11/19 09:46:04 spiegel Exp $ |
| 9 | 9 | ||
| 10 | ;; This file is part of GNU Emacs. | 10 | ;; This file is part of GNU Emacs. |
| 11 | 11 | ||
| @@ -123,13 +123,14 @@ For a description of possible values, see `vc-check-master-templates'." | |||
| 123 | (vc-rcs-fetch-master-state file | 123 | (vc-rcs-fetch-master-state file |
| 124 | (vc-file-getprop file | 124 | (vc-file-getprop file |
| 125 | 'vc-workfile-version)))) | 125 | 'vc-workfile-version)))) |
| 126 | (if (eq state 'up-to-date) | 126 | (if (not (eq state 'up-to-date)) |
| 127 | (if (vc-workfile-unchanged-p file) | 127 | state |
| 128 | 'up-to-date | 128 | (require 'vc) |
| 129 | (if (eq (vc-checkout-model file) 'locking) | 129 | (if (vc-workfile-unchanged-p file) |
| 130 | 'unlocked-changes | 130 | 'up-to-date |
| 131 | 'edited)) | 131 | (if (eq (vc-checkout-model file) 'locking) |
| 132 | state))) | 132 | 'unlocked-changes |
| 133 | 'edited))))) | ||
| 133 | 134 | ||
| 134 | (defun vc-rcs-state-heuristic (file) | 135 | (defun vc-rcs-state-heuristic (file) |
| 135 | "State heuristic for RCS." | 136 | "State heuristic for RCS." |