2 files changed, 7 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2bfac1a85fd..85428ad9ae6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
 2000-10-24  Gerd Moellmann  <gerd@gnu.org>
 
+        * wid-edit.el (widget-field-keymap, widget-text-keymap): Define
+        the tool-bar map as nil, as for the menu-bar.  Otherwise, we'll
+        get duplicate tool-bar entries because we'll see the global ones
+        on more than one path through keymaps.
+
         * emacs-lisp/lisp.el (defun-prompt-regexp): Doc fix.
 
         * progmodes/cmacexp.el: Change Francesco's email address.
diff --git a/src/ChangeLog b/src/ChangeLog
index ed0f950b9e1..dbe7e11c6f5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2000-10-24  Gerd Moellmann  <gerd@gnu.org>
 
+        * keymap.c: Update copyright.
+
         * .gdbinit (xbacktrace): Handle case that $bt->function isn't
         a symbol.