mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-27 23:50:30 -08:00
Code Issues Projects Releases Wiki Activity

Merge from trunk

Browse source
This commit is contained in:
Jan Djärv 2010-01-06 17:04:19 +01:00
commit ea2b370da2
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lisp/ChangeLog
View file

@ -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

3
lisp/vc-bzr.el
View file

@ -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))