aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/vc-hg.el2
2 files changed, 3 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 226eec3fb14..0f7f02dd00d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12008-03-23 Dan Nicolaescu <dann@ics.uci.edu> 12008-03-23 Dan Nicolaescu <dann@ics.uci.edu>
2 2
3 * vc-hg.el (vc-hg-state): Return 'edited for removed files.
4
3 * bindings.el (standard-mode-line-modes): Avoid duplicating a string. 5 * bindings.el (standard-mode-line-modes): Avoid duplicating a string.
4 6
5 * vc-cvs.el (vc-cvs-parse-status): Note there are problems with 7 * vc-cvs.el (vc-cvs-parse-status): Note there are problems with
diff --git a/lisp/vc-hg.el b/lisp/vc-hg.el
index 8e55eb20174..d2960bad516 100644
--- a/lisp/vc-hg.el
+++ b/lisp/vc-hg.el
@@ -176,7 +176,7 @@
176 ((eq state ?A) 'added) 176 ((eq state ?A) 'added)
177 ((eq state ?M) 'edited) 177 ((eq state ?M) 'edited)
178 ((eq state ?I) 'ignored) 178 ((eq state ?I) 'ignored)
179 ((eq state ?R) 'unregistered) 179 ((eq state ?R) 'edited)
180 ((eq state ??) 'unregistered) 180 ((eq state ??) 'unregistered)
181 ((eq state ?C) 'up-to-date) ;; Older mercurials use this 181 ((eq state ?C) 'up-to-date) ;; Older mercurials use this
182 (t 'up-to-date))))))) 182 (t 'up-to-date)))))))