*** empty log message ***

3 files changed, 14 insertions, 3 deletions

diff --git a/etc/NEWS b/etc/NEWS
index c85ec30bb03..2d8b10e81ec 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -2189,7 +2189,7 @@ configuration files.
 
 +++
 ** Both the variable and the function `disabled-command-hook' have
-been renamed to `disabled-command-function',  The variable
+been renamed to `disabled-command-function'.  The variable
 `disabled-command-hook' has been kept as an obsolete alias.
 
 ** Function `compute-motion' now calculates the usable window
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c59e0003f94..afa583fd9ef 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,14 @@
+2004-08-08  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * subr.el (global-unset-key, local-unset-key): Doc fixes.
+
+        * novice.el (disabled-command-function): New variable renamed from
+        `disabled-command-hook'.
+        (disabled-command-hook): Keep the _variable_ as alias for
+        `disabled-command-function' and make obsolete.
+        (disabled-command-function): Function renamed from
+        `disabled-command-hook'.  Adapt code to name change of the variable.
+
 2004-08-07  Satyaki Das  <satyaki@theforce.stanford.edu>  (tiny change)
 
         * simple.el (completion-root-regexp): New defvar.
diff --git a/src/ChangeLog b/src/ChangeLog
index 7ec9ec257d8..248d5daa92e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,9 +1,9 @@
 2004-08-08  Luc Teirlinck  <teirllm@auburn.edu>
 
         * keyboard.c: Declare Qdisabled_command_function instead of
-        Qdisabled_command_command.
+        Qdisabled_command_hook.
         (Fcommand_execute): Use Qdisabled_command_function instead of
-        Qdisabled_command_command.
+        Qdisabled_command_hook.
         (syms_of_keyboard): Ditto.
 
 2004-08-07  Luc Teirlinck  <teirllm@auburn.edu>