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-mtn.el | |
| parent | 4f54f7b3760218d53743e5f8e3f0d3065a03ee23 (diff) | |
| download | emacs-ed6ce56e2326fb8b257e63e015598ad74b5fd35c.tar.gz | |
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-mtn.el')
| -rw-r--r-- | lisp/vc/vc-mtn.el | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/vc/vc-mtn.el b/lisp/vc/vc-mtn.el index b32a1db744d..e03d8551d6e 100644 --- a/lisp/vc/vc-mtn.el +++ b/lisp/vc/vc-mtn.el @@ -238,9 +238,11 @@ If LIMIT is non-nil, show no more than this many entries." (autoload 'vc-switches "vc") -(defun vc-mtn-diff (files &optional rev1 rev2 buffer) +(defun vc-mtn-diff (files &optional async rev1 rev2 buffer) "Get a difference report using monotone between two revisions of FILES." - (apply 'vc-mtn-command (or buffer "*vc-diff*") 1 files "diff" + (apply 'vc-mtn-command (or buffer "*vc-diff*") + (if async 'async 1) + files "diff" (append (vc-switches 'mtn 'diff) (if rev1 (list "-r" rev1)) (if rev2 (list "-r" rev2))))) |