# HG changeset patch
# User Andr��� Spiegel <spiegel@gnu.org>
# Date 1105306438 0
# Node ID 56133222a4e2f2aa449db60883edb9860e859ee8
# Parent  1ba18e6577963eb93ffd19aae0e8da865d4fc79a
#

diff -r 1ba18e657796 -r 56133222a4e2 lisp/ChangeLog
--- a/lisp/ChangeLog	Sun Jan 09 21:30:56 2005 +0000
+++ b/lisp/ChangeLog	Sun Jan 09 21:33:58 2005 +0000
@@ -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.