*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 514584eaae3861ff216fb66aff60b6ac137eb93b..0d56fe54f16f7658888a336277396fa7c4d7d70e 100644 (file)
--- 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 e0446868e68bd9e1454307e7fffcd813b7af468b..2040b8245f5c26f48f715c882a2fc53169ed69c2 100644 (file)
--- 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.