Mercurial > emacs

changeset 59445:73a45ff77795

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(vc-mcvs-diff): Don't diff asynchronously if vc-disable-async-diff is t.
author André Spiegel <spiegel@gnu.org>
date Sun, 09 Jan 2005 21:29:54 +0000
parents 5173e8c74cae
children 1ba18e657796
files lisp/vc-mcvs.el
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/vc-mcvs.el	Sun Jan 09 21:29:27 2005 +0000
+++ b/lisp/vc-mcvs.el	Sun Jan 09 21:29:54 2005 +0000
@@ -446,7 +446,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)))
 	   ;; Run the command from the root dir so that `mcvs filt' returns
 	   ;; valid relative names.
 	   (default-directory (vc-mcvs-root file))