2 files changed, 17 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a7e5c084772..0c176e43356 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/src/ChangeLog b/src/ChangeLog
index 890c50567a3..8c1fffe9911 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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.