From b25d6a02fdbde0f9f9491c0f7d4abe1400d9170e Mon Sep 17 00:00:00 2001 From: Dan Nicolaescu Date: Mon, 4 Jan 2010 23:46:35 -0800 Subject: [PATCH] (vc-bzr-diff): Obey vc-disable-async-diff. --- lisp/ChangeLog | 4 ++++ lisp/vc-bzr.el | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index bf32b86899b..52f24391186 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2010-01-05 Dan Nicolaescu + + * vc-bzr.el (vc-bzr-diff): Obey vc-disable-async-diff. + 2010-01-04 Dan Nicolaescu * 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 e2560e4c013..fc62696af1d 100644 --- 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) " ") -- 2.39.2