#

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3209ae3982cbf25426edd2a35062bf2c8fb77828..2e9dffa20401fd5fbdf25817319df4db9b57e4f4 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2000-11-22  Andre Spiegel  <spiegel@gnu.org>
+
+       * ediff-util.el: (ediff-file-checked-out-p,
+       ediff-file-checked-in-p): Call vc-state instead of 
+       vc-locking-user, which no longer exists.
+
+       * emulation/viper-util.el (viper-file-checked-in-p): Same as above.
+
 2000-11-22  Dave Love  <fx@gnu.org>
 
        * md5.el (md5): Provide.