From ed6ce56e2326fb8b257e63e015598ad74b5fd35c Mon Sep 17 00:00:00 2001 From: "Eric S. Raymond" Date: Mon, 1 Dec 2014 17:56:41 -0500 Subject: 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. --- lisp/vc/vc-cvs.el | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'lisp/vc/vc-cvs.el') 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 -- cgit v1.2.3