aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog1
-rw-r--r--lisp/vc-hg.el2
2 files changed, 2 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 65556e2eb65..5d9d50e7a64 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,6 @@
12008-01-20 Dan Nicolaescu <dann@ics.uci.edu> 12008-01-20 Dan Nicolaescu <dann@ics.uci.edu>
2 2
3 * vc-hg.el (vc-hg-registered):
3 * vc-svn.el (vc-svn-registered): Make it work for non-existent 4 * vc-svn.el (vc-svn-registered): Make it work for non-existent
4 files. 5 files.
5 6
diff --git a/lisp/vc-hg.el b/lisp/vc-hg.el
index c3c3b5577f3..7b7ca3b7f6d 100644
--- a/lisp/vc-hg.el
+++ b/lisp/vc-hg.el
@@ -149,7 +149,7 @@
149 (when (vc-hg-root file) ; short cut 149 (when (vc-hg-root file) ; short cut
150 (let ((state (vc-hg-state file))) ; expensive 150 (let ((state (vc-hg-state file))) ; expensive
151 (vc-file-setprop file 'vc-state state) 151 (vc-file-setprop file 'vc-state state)
152 (not (memq state '(ignored unregistered)))))) 152 (and state (not (memq state '(ignored unregistered)))))))
153 153
154(defun vc-hg-state (file) 154(defun vc-hg-state (file)
155 "Hg-specific version of `vc-state'." 155 "Hg-specific version of `vc-state'."