From: André Spiegel <spiegel@gnu.org>
Date: Wed, 22 Nov 2000 12:59:03 +0000 (+0000)
Subject: #
X-Git-Tag: emacs-pretest-21.0.92~185
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e08b2069c79b3a3e15bf073eac041539860abfbc;p=emacs.git

#
---

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.