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-git.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-git.el')
| -rw-r--r-- | lisp/vc/vc-git.el | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index 53db340146f..8fdea8c216b 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el @@ -984,11 +984,13 @@ or BRANCH^ (where \"^\" can be repeated)." (autoload 'vc-switches "vc") -(defun vc-git-diff (files &optional rev1 rev2 buffer) +(defun vc-git-diff (files &optional async rev1 rev2 buffer) "Get a difference report using Git between two revisions of FILES." (let (process-file-side-effects) (if vc-git-diff-switches - (apply #'vc-git-command (or buffer "*vc-diff*") 1 files + (apply #'vc-git-command (or buffer "*vc-diff*") + (if async 'async 1) + files (if (and rev1 rev2) "diff-tree" "diff-index") "--exit-code" (append (vc-switches 'git 'diff) |