From: André Spiegel <spiegel@gnu.org>
Date: Sun, 9 Jan 2005 21:33:58 +0000 (+0000)
Subject: #
X-Git-Tag: ttn-vms-21-2-B4~2839
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5fbf7903eefda5964a96b5f328e5dd6934f5e740;p=emacs.git

#
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f39e967f557..5c10e40e37a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2005-01-09  Andre Spiegel  <spiegel@gnu.org>
+
+	* vc.el (vc-allow-async-revert): New user option.
+	(vc-disable-async-diff): New internal variable.
+	(vc-revert-buffer): Use them to disable asynchronous diff.
+
+	* vc-cvs.el, vc-arch.el, vc-svn.el, vc-mcvs.el (vc-cvs-diff,
+	vc-arch-diff, vc-svn-diff, vc-mcvs-diff): Don't diff
+	asynchronously if vc-disable-async-diff is t.
+
 2005-01-09  Jay Belanger  <belanger@truman.edu>
 
 	* calc/calc.el (defcalcmodevar): New macro.