summaryrefslogtreecommitdiff
path: root/lisp/vc-rcs.el
diff options
context:
space:
mode:
authorEric S. Raymond <esr@snark.thyrsus.com>2008-05-01 19:13:16 +0000
committerEric S. Raymond <esr@snark.thyrsus.com>2008-05-01 19:13:16 +0000
commit3702367bcef4d8987b1c6aa06ab29ec0390d6887 (patch)
tree28e5ebf63522f5a5b0930eeccaf573a613b6b0b3 /lisp/vc-rcs.el
parenta84615c77a3642de1ddc4f488017adfab586a33e (diff)
downloademacs-3702367bcef4d8987b1c6aa06ab29ec0390d6887.tar.gz
Change 'needs-patch to 'needs-update.
Diffstat (limited to 'lisp/vc-rcs.el')
-rw-r--r--lisp/vc-rcs.el38
1 files changed, 20 insertions, 18 deletions
diff --git a/lisp/vc-rcs.el b/lisp/vc-rcs.el
index a1b10aaa541..e87abef125f 100644
--- a/lisp/vc-rcs.el
+++ b/lisp/vc-rcs.el
@@ -118,23 +118,25 @@ For a description of possible values, see `vc-check-master-templates'."
(defun vc-rcs-state (file)
"Implementation of `vc-state' for RCS."
- (or (boundp 'vc-rcs-headers-result)
- (and vc-consult-headers
- (vc-rcs-consult-headers file)))
- (let ((state
- ;; vc-working-revision might not be known; in that case the
- ;; property is nil. vc-rcs-fetch-master-state knows how to
- ;; handle that.
- (vc-rcs-fetch-master-state file
- (vc-file-getprop file
- 'vc-working-revision))))
- (if (not (eq state 'up-to-date))
- state
- (if (vc-workfile-unchanged-p file)
- 'up-to-date
- (if (eq (vc-rcs-checkout-model file) 'locking)
- 'unlocked-changes
- 'edited)))))
+ (if (not (vc-rc-registered f))
+ 'unregistered
+ (or (boundp 'vc-rcs-headers-result)
+ (and vc-consult-headers
+ (vc-rcs-consult-headers file)))
+ (let ((state
+ ;; vc-working-revision might not be known; in that case the
+ ;; property is nil. vc-rcs-fetch-master-state knows how to
+ ;; handle that.
+ (vc-rcs-fetch-master-state file
+ (vc-file-getprop file
+ 'vc-working-revision))))
+ (if (not (eq state 'up-to-date))
+ state
+ (if (vc-workfile-unchanged-p file)
+ 'up-to-date
+ (if (eq (vc-rcs-checkout-model file) 'locking)
+ 'unlocked-changes
+ 'edited))))))
(defun vc-rcs-state-heuristic (file)
"State heuristic for RCS."
@@ -889,7 +891,7 @@ file."
;; workfile version is latest on branch
'up-to-date
;; workfile version is not latest on branch
- 'needs-patch))
+ 'needs-update))
;; locked by the calling user
((and (stringp locking-user)
(string= locking-user (vc-user-login-name file)))