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

b25d6a02 · Dan Nicolaescu · c57008f6 · b25d6a02 · b25d6a02
Commit b25d6a02 authored Jan 04, 2010 by Dan Nicolaescu
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

lisp/ChangeLog lisp/ChangeLog +4 -0

lisp/vc-bzr.el lisp/vc-bzr.el +2 -1

No files found.
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
+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
+++ 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)
 				     " ")