]> git.eshelyaron.com Git - emacs.git/commit
Improvements to vc-bzr conffile handling and pull/merge support.
authorChong Yidong <cyd@stupidchicken.com>
Sat, 19 Feb 2011 21:23:51 +0000 (16:23 -0500)
committerChong Yidong <cyd@stupidchicken.com>
Sat, 19 Feb 2011 21:23:51 +0000 (16:23 -0500)
commit3ab713fdac16ef6ae249b3da69d69e78361f6792
treef2a9c266e5e20e2d67269d06bc80f35348cdd24a
parentcad7445b369d55101bf94537292a1142359de60f
Improvements to vc-bzr conffile handling and pull/merge support.

* vc/vc-bzr.el (vc-bzr--branch-conf): Function deleted.
(vc-bzr-branch-conf): New function, similar to vc-bzr--branch-conf
but returning an alist.  Ignore comments in bzr conffile.
(vc-bzr-pull, vc-bzr-merge-branch): Use vc-bzr-branch-conf.
(vc-bzr-error-regex-alist): New var.
(vc-bzr-merge-branch): Use it to highlight the pull/merge buffer.

* progmodes/compile.el (compilation--flush-directory-cache):
Handle the case where cdr of compilation--flush-directory-cache
points to no buffer, which can occur if we previously switched to
compilation-mode in a pregenerated buffer.

* vc/vc-dispatcher.el (vc-do-async-command): Bind
inhibit-read-only to t.
lisp/ChangeLog
lisp/progmodes/compile.el
lisp/vc/vc-bzr.el
lisp/vc/vc-dispatcher.el