#

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f39e967f557b4f1bb7eb305c572b5ca28d39e057..5c10e40e37a00ebfc3c32870cf16bc077640a7c3 100644 (file)
--- 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.