# HG changeset patch
# User Luc Teirlinck <teirllm@auburn.edu>
# Date 1091985298 0
# Node ID 566a024b577f00b385e5fc61f3373a4f445cd5f4
# Parent  6c25cc5e679c700263b59923ae569b4cdf14ad0f
*** empty log message ***

diff -r 6c25cc5e679c -r 566a024b577f etc/NEWS
--- a/etc/NEWS	Sun Aug 08 17:09:43 2004 +0000
+++ b/etc/NEWS	Sun Aug 08 17:14:58 2004 +0000
@@ -2189,7 +2189,7 @@
 
 +++
 ** 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 -r 6c25cc5e679c -r 566a024b577f lisp/ChangeLog
--- a/lisp/ChangeLog	Sun Aug 08 17:09:43 2004 +0000
+++ b/lisp/ChangeLog	Sun Aug 08 17:14:58 2004 +0000
@@ -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 -r 6c25cc5e679c -r 566a024b577f src/ChangeLog
--- a/src/ChangeLog	Sun Aug 08 17:09:43 2004 +0000
+++ b/src/ChangeLog	Sun Aug 08 17:14:58 2004 +0000
@@ -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>