aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndré Spiegel2004-11-30 11:02:23 +0000
committerAndré Spiegel2004-11-30 11:02:23 +0000
commit5124dd38c87e7ae1e2cbd0e9f2c1e7fc07d040b9 (patch)
tree8a73cae11041f102e1b30ab6ff3b45045d2091f3
parent25a0994a8186886b117b99e7e878dc2ac6cdeae6 (diff)
downloademacs-5124dd38c87e7ae1e2cbd0e9f2c1e7fc07d040b9.tar.gz
emacs-5124dd38c87e7ae1e2cbd0e9f2c1e7fc07d040b9.zip
(vc-cvs-state): Handle the case where vc-state is still nil.
-rw-r--r--lisp/vc-cvs.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/vc-cvs.el b/lisp/vc-cvs.el
index 45ff233eb86..22346cab68c 100644
--- a/lisp/vc-cvs.el
+++ b/lisp/vc-cvs.el
@@ -189,7 +189,7 @@ See also variable `vc-cvs-sticky-date-format-string'."
189 (let ((state (vc-file-getprop file 'vc-state))) 189 (let ((state (vc-file-getprop file 'vc-state)))
190 ;; If we should stay local, use the heuristic but only if 190 ;; If we should stay local, use the heuristic but only if
191 ;; we don't have a more precise state already available. 191 ;; we don't have a more precise state already available.
192 (if (memq state '(up-to-date edited)) 192 (if (memq state '(up-to-date edited nil))
193 (vc-cvs-state-heuristic file) 193 (vc-cvs-state-heuristic file)
194 state)) 194 state))
195 (with-temp-buffer 195 (with-temp-buffer