(vc-bzr-diff): Obey vc-disable-async-diff.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bf32b86899b45c1bd52c68a7e4953908a79ff9e5..52f243911864ba4c8625f741247d5f0b46be0851 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/lisp/vc-bzr.el b/lisp/vc-bzr.el
index e2560e4c013c483495d971f87ca38a498420ff38..fc62696af1d693d39319b3c5dfe6d2d17043d1c3 100644 (file)
--- a/lisp/vc-bzr.el
+++ b/lisp/vc-bzr.el
@@ -532,7 +532,8 @@ REV non-nil gets an error."
 (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)
                                     " ")