# HG changeset patch
# User Kim F. Storm <storm@cua.dk>
# Date 1016746411 0
# Node ID bf72a8fa9d175c8685ba5aa6629957bbf486e36d
# Parent  92101c2bc6bf64aa3c9e7329953fdfe90967b061
*** empty log message ***

diff -r 92101c2bc6bf -r bf72a8fa9d17 src/ChangeLog
--- a/src/ChangeLog	Thu Mar 21 21:32:50 2002 +0000
+++ b/src/ChangeLog	Thu Mar 21 21:33:31 2002 +0000
@@ -1,3 +1,11 @@
+2002-03-21  Kim F. Storm  <storm@cua.dk>
+
+	* keyboard.c (menu_bar_items): Mostly undo 2002-02-20 patch, so
+	menu-bar bindings in keymap and local-map properties _are_ used.
+	But try keymap property first in accordance with 2002-01-03 patch.
+	Added comment describing why this is not always reliable.
+	(tool_bar_items): Ditto for tool-bar.
+
 2002-03-21  Jason Rumney  <jasonr@gnu.org>
 
 	* w32fns.c (x_clear_image_1): Disable color table code.