# HG changeset patch
# User Andr��� Spiegel <spiegel@gnu.org>
# Date 974897943 0
# Node ID fb9bb620d52a138a0d9f7729bce944029997c461
# Parent  f3a1a5ef5e7fba2c7e130effd8d8a5e99a1ba650
#

diff -r f3a1a5ef5e7f -r fb9bb620d52a lisp/ChangeLog
--- a/lisp/ChangeLog	Wed Nov 22 12:55:31 2000 +0000
+++ b/lisp/ChangeLog	Wed Nov 22 12:59:03 2000 +0000
@@ -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.