aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Nicolaescu2008-03-23 20:50:52 +0000
committerDan Nicolaescu2008-03-23 20:50:52 +0000
commit54bf37044b358dc1d58d93cbecb9d8472d88089a (patch)
tree2caf12f5b14d17b36f91b6f116aba8801b9c76a3
parent5440448eb6109fb344c09276f8978460bc44567a (diff)
downloademacs-54bf37044b358dc1d58d93cbecb9d8472d88089a.tar.gz
emacs-54bf37044b358dc1d58d93cbecb9d8472d88089a.zip
(vc-bzr-state): Return 'removed for removed files and
'unregistered for unregistered files.
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/vc-bzr.el6
2 files changed, 6 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c7353cbebdf..b64aa9a09f4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
12008-03-23 Dan Nicolaescu <dann@ics.uci.edu> 12008-03-23 Dan Nicolaescu <dann@ics.uci.edu>
2 2
3 * vc-bzr.el (vc-bzr-state): Return 'removed for removed files and
4 'unregistered for unregistered files.
5
3 * vc-hg.el (vc-hg-state): Return 'removed for removed files. 6 * vc-hg.el (vc-hg-state): Return 'removed for removed files.
4 7
5 * bindings.el (standard-mode-line-modes): Avoid duplicating a string. 8 * bindings.el (standard-mode-line-modes): Avoid duplicating a string.
diff --git a/lisp/vc-bzr.el b/lisp/vc-bzr.el
index 93ffed16c48..f44670e7bc3 100644
--- a/lisp/vc-bzr.el
+++ b/lisp/vc-bzr.el
@@ -227,9 +227,9 @@ If any error occurred in running `bzr status', then return nil."
227 (kindchanged . edited) 227 (kindchanged . edited)
228 (renamed . edited) 228 (renamed . edited)
229 (modified . edited) 229 (modified . edited)
230 (removed . edited) 230 (removed . removed)
231 (ignored . nil) 231 (ignored . unregistered)
232 (unknown . nil) 232 (unknown . unregistered)
233 (unchanged . up-to-date))))))) 233 (unchanged . up-to-date)))))))
234 234
235(defun vc-bzr-resolve-when-done () 235(defun vc-bzr-resolve-when-done ()