*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a7e5c0847724d816f6a34697889fae672a42fd59..0c176e43356e69c917be1492aaafe1c92f560fac 100644 (file)
--- 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 890c50567a37c09fa81672182c6c1149df58f7cc..8c1fffe991109e27289b5c962b6c5a10531e4a00 100644 (file)
--- 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.