Mercurial > emacs

changeset 106732:d804f575197b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(vc-bzr-diff): Obey vc-disable-async-diff.
author Dan Nicolaescu <dann@ics.uci.edu>
date Mon, 04 Jan 2010 23:46:35 -0800
parents 79fa2d910b72
children a92501a57937 b12f3cb1fe53
files lisp/ChangeLog lisp/vc-bzr.el
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	Mon Jan 04 23:46:35 2010 -0800
@@ -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	Mon Jan 04 23:46:35 2010 -0800
@@ -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)
 				     " ")