Mercurial > emacs

changeset 59443:fd6e4e55ca84

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(vc-cvs-diff): Don't diff asynchronously if vc-disable-async-diff is t.
author André Spiegel <spiegel@gnu.org>
date Sun, 09 Jan 2005 21:28:53 +0000
parents 37d47d9bf8b1
children 5173e8c74cae
files lisp/vc-cvs.el
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/vc-cvs.el	Sun Jan 09 21:27:28 2005 +0000
+++ b/lisp/vc-cvs.el	Sun Jan 09 21:28:53 2005 +0000
@@ -548,7 +548,9 @@
 	       (append (vc-switches nil 'diff) '("/dev/null")))
 	;; Even if it's empty, it's locally modified.
 	1)
-    (let* ((async (and (vc-stay-local-p file) (fboundp 'start-process)))
+    (let* ((async (and (not vc-disable-async-diff) 
+                       (vc-stay-local-p file)
+                       (fboundp 'start-process)))
 	   (status (apply 'vc-cvs-command (or buffer "*vc-diff*")
 			  (if async 'async 1)
 			  file "diff"