# HG changeset patch
# User Kenichi Handa  <handa@m17n.org>
# Date 1262691739 -32400
# Node ID a92501a579373f9d027e0b91b92fa1d8a2cd7478
# Parent  79fa2d910b72e0506403f323b9eb895ec9d1caf7# Parent  d804f575197b96ef7e762c0bb1822fb028b0f59d
merge from trunk

diff -r 79fa2d910b72 -r a92501a57937 lisp/ChangeLog
--- 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
diff -r 79fa2d910b72 -r a92501a57937 lisp/vc-bzr.el
--- 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)
 				     " ")