From e08b2069c79b3a3e15bf073eac041539860abfbc Mon Sep 17 00:00:00 2001
From: =?utf8?q?Andr=C3=A9=20Spiegel?= <spiegel@gnu.org>
Date: Wed, 22 Nov 2000 12:59:03 +0000
Subject: [PATCH] #

---
 lisp/ChangeLog | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3209ae3982c..2e9dffa2040 100644
--- 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.
-- 
2.39.2