From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Wed, 25 Oct 2000 23:36:06 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-21.0.90~567
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d97151cb57618491364b74fccef2a4a67fd4d78b;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 514584eaae3..0d56fe54f16 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2000-10-25  Stefan Monnier  <monnier@cs.yale.edu>
+
+	* vc.el (vc-version-other-window): Bind `file'.
+
 2000-10-25  Gerd Moellmann  <gerd@gnu.org>
 
 	* Makefile.in (update-authors): New target for maintenance
diff --git a/src/ChangeLog b/src/ChangeLog
index e0446868e68..2040b8245f5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,13 @@
+2000-10-25  Stefan Monnier  <monnier@cs.yale.edu>
+
+	* keymap.c (where_is_cache, where_is_cache_keymaps): New vars.
+	(Fset_keymap_parent, store_in_keymap): Flush the where-is cache.
+	(where_is_internal): Renamed from Fwhere_is_internal.
+	Don't DEFUN any more. Arg `xkeymap' replaced by `keymaps'.
+	(Fwhere_is_internal): New function wrapping where_is_internal.
+	(where_is_internal_1): Handle the case where we're filling the cache.
+	(syms_of_keymap): Init and gcpro the where_is_cache(|_keymaps).
+
 2000-10-25  Miles Bader  <miles@gnu.org>
 
 	* xdisp.c (pos_visible_p): Don't add `it.current_y' twice.