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-cvs.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-cvs.el')
| -rw-r--r-- | lisp/vc/vc-cvs.el | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lisp/vc/vc-cvs.el b/lisp/vc/vc-cvs.el index fc1e8572578..41c53261464 100644 --- a/lisp/vc/vc-cvs.el +++ b/lisp/vc/vc-cvs.el @@ -569,11 +569,10 @@ Remaining arguments are ignored." (autoload 'vc-version-backup-file "vc") (declare-function vc-coding-system-for-diff "vc" (file)) -(defun vc-cvs-diff (files &optional oldvers newvers buffer) +(defun vc-cvs-diff (files &optional async oldvers newvers buffer) "Get a difference report using CVS between two revisions of FILE." (let* (process-file-side-effects - (async (and (not vc-disable-async-diff) - (vc-cvs-stay-local-p files))) + (async (and async (vc-cvs-stay-local-p files))) (invoke-cvs-diff-list nil) status) ;; Look through the file list and see if any files have backups |