diff options
| author | Eric S. Raymond <esr@thyrsus.com> | 2014-12-01 17:56:41 -0500 |
|---|---|---|
| committer | Eric S. Raymond <esr@thyrsus.com> | 2014-12-01 17:56:41 -0500 |
| commit | ed6ce56e2326fb8b257e63e015598ad74b5fd35c (patch) | |
| tree | 1ed8dd3c30e61b12e7243c3a6a9e8da29aa38623 /lisp/vc/vc-bzr.el | |
| parent | 4f54f7b3760218d53743e5f8e3f0d3065a03ee23 (diff) | |
| download | emacs-ed6ce56e2326fb8b257e63e015598ad74b5fd35c.tar.gz emacs-ed6ce56e2326fb8b257e63e015598ad74b5fd35c.tar.bz2 emacs-ed6ce56e2326fb8b257e63e015598ad74b5fd35c.zip | |
Terminate vc-disable-async-diff with extreme prejudice.
* vc/vc.el, and all backends: API cleanup; the backend diff method
takes an explicit async flag. This eliminates a particularly ugly
global.
Diffstat (limited to 'lisp/vc/vc-bzr.el')
| -rw-r--r-- | lisp/vc/vc-bzr.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/vc/vc-bzr.el b/lisp/vc/vc-bzr.el index 7f30378227f..48476dc9654 100644 --- a/lisp/vc/vc-bzr.el +++ b/lisp/vc/vc-bzr.el @@ -779,7 +779,7 @@ If LIMIT is non-nil, show no more than this many entries." (autoload 'vc-switches "vc") -(defun vc-bzr-diff (files &optional rev1 rev2 buffer) +(defun vc-bzr-diff (files &optional async rev1 rev2 buffer) "VC bzr backend for diff." (let* ((switches (vc-switches 'bzr 'diff)) (args @@ -795,7 +795,7 @@ If LIMIT is non-nil, show no more than this many entries." (or rev2 ""))))))) ;; `bzr diff' exits with code 1 if diff is non-empty. (apply #'vc-bzr-command "diff" (or buffer "*vc-diff*") - (if vc-disable-async-diff 1 'async) files + (if async 1 'async) files args))) |