Commit b25d6a02 authored by Dan Nicolaescu's avatar Dan Nicolaescu
Browse files

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

parent c57008f6
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
......
......@@ -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)
" ")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment