# HG changeset patch
# User Eli Zaretskii <eliz@gnu.org>
# Date 1139666174 0
# Node ID eb282d2484e6d1632c4eedd0d8648cb5d8a149de
# Parent  71c7af923901cb0277283d8fb4c5a204d8be9544
*** empty log message ***

diff -r 71c7af923901 -r eb282d2484e6 lisp/ChangeLog
--- a/lisp/ChangeLog	Sat Feb 11 13:55:42 2006 +0000
+++ b/lisp/ChangeLog	Sat Feb 11 13:56:14 2006 +0000
@@ -1,3 +1,13 @@
+2006-02-11  Eli Zaretskii  <eliz@gnu.org>
+
+	* help.el (describe-key-briefly): Now a wrapper for
+	describe-key-briefly-internal.  Bind enable-disabled-menus-and-buttons
+	to t.
+	(describe-key-briefly-internal): Renamed from describe-key-briefly.
+	(describe-key): Now a wrapper for describe-key-internal.  Bind
+	enable-disabled-menus-and-buttons to t.
+	(describe-key-internal): Renamed from describe-key.
+
 2006-02-11  Milan Zamazal  <pdm@zamazal.org>
 
 	* progmodes/glasses.el (glasses-separator): Doc fix.
diff -r 71c7af923901 -r eb282d2484e6 src/ChangeLog
--- a/src/ChangeLog	Sat Feb 11 13:55:42 2006 +0000
+++ b/src/ChangeLog	Sat Feb 11 13:56:14 2006 +0000
@@ -1,3 +1,10 @@
+2006-02-11  Eli Zaretskii  <eliz@gnu.org>
+
+	* keyboard.c (Venable_disabled_menus_and_buttons): New variable.
+	(syms_of_keyboard): DEVFAR_LISP and initialize it.
+	(parse_tool_bar_item, parse_menu_item): If that variable is
+	non-nil, don't disable menu items and tool-bar buttons.
+
 2006-02-11  Juanma Barranquero  <lekktu@gmail.com>
 
 	* doc.c (Fsubstitute_command_keys): Doc fix.