Mercurial > emacs
changeset 106733:a92501a57937
merge from trunk
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Tue, 05 Jan 2010 20:42:19 +0900 |
| parents | 79fa2d910b72 (current diff) d804f575197b (diff) |
| children | 562e48429719 |
| files | |
| diffstat | 2 files changed, 6 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Mon Jan 04 13:18:38 2010 -0500 +++ b/lisp/ChangeLog Tue Jan 05 20:42:19 2010 +0900 @@ -1,3 +1,7 @@ +2010-01-05 Dan Nicolaescu <dann@ics.uci.edu> + + * vc-bzr.el (vc-bzr-diff): Obey vc-disable-async-diff. + 2010-01-04 Dan Nicolaescu <dann@ics.uci.edu> * vc-bzr.el (vc-bzr-state-heuristic): Make it work for lightweight
--- a/lisp/vc-bzr.el Mon Jan 04 13:18:38 2010 -0500 +++ b/lisp/vc-bzr.el Tue Jan 05 20:42:19 2010 +0900 @@ -532,7 +532,8 @@ (defun vc-bzr-diff (files &optional rev1 rev2 buffer) "VC bzr backend for diff." ;; `bzr diff' exits with code 1 if diff is non-empty. - (apply #'vc-bzr-command "diff" (or buffer "*vc-diff*") 'async files + (apply #'vc-bzr-command "diff" (or buffer "*vc-diff*") + (if vc-disable-async-diff 1 'async) files "--diff-options" (mapconcat 'identity (vc-switches 'bzr 'diff) " ")