Merge from trunk

2 files changed, 6 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2827ff8d9d5..a5569604bd8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2010-01-06  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * vc-bzr.el (vc-bzr-after-dir-status): Ignore pending merges.
+
 2010-01-05  Tom Tromey  <tromey@redhat.com>
 
         * progmodes/python.el (python-font-lock-keywords): Handle
diff --git a/lisp/vc-bzr.el b/lisp/vc-bzr.el
index d0b8ec8ff6a..f140671be12 100644
--- a/lisp/vc-bzr.el
+++ b/lisp/vc-bzr.el
@@ -671,7 +671,6 @@ stream.  Standard error output is discarded."
                        ;; For conflicts, should we list the .THIS/.BASE/.OTHER?
                        ("C  " . conflict)
                        ("?  " . unregistered)
-                       ("?  " . unregistered)
                        ;; No such state, but we need to distinguish this case.
                        ("R  " . renamed)
                        ;; For a non existent file FOO, the output is:
@@ -683,6 +682,8 @@ stream.  Standard error output is discarded."
                        ;; FIXME: maybe this warning can be put in the vc-dir header...
                        ("wor" . not-found)
                        ;; Ignore "P " and "P." for pending patches.
+                       ("P  " . not-found)
+                       ("P. " . not-found)
                        ))
         (translated nil)
         (result nil))