# HG changeset patch
# User Gerd Moellmann <gerd@gnu.org>
# Date 972390773 0
# Node ID 6de838d8bdbc37a83b53d9cca194d6de487dde10
# Parent  f915f46d067c06a215027576c53c6d001d99d797
*** empty log message ***

diff -r f915f46d067c -r 6de838d8bdbc lisp/ChangeLog
--- a/lisp/ChangeLog	Tue Oct 24 12:32:33 2000 +0000
+++ b/lisp/ChangeLog	Tue Oct 24 12:32:53 2000 +0000
@@ -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 -r f915f46d067c -r 6de838d8bdbc src/ChangeLog
--- a/src/ChangeLog	Tue Oct 24 12:32:33 2000 +0000
+++ b/src/ChangeLog	Tue Oct 24 12:32:53 2000 +0000
@@ -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.