*** empty log message ***

etc/NEWS

@@ -2187,6 +2187,11 @@ configuration files.
 
 * Lisp Changes in Emacs 21.4
 
++++
+** Both the variable and the function `disabled-command-hook' have
+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
 width if the WIDTH argument is nil.  If the TOPOS argument is nil,
 the usable window height and width is used.

src/ChangeLog

@@ -1,3 +1,11 @@
+2004-08-08  Luc Teirlinck  <teirllm@auburn.edu>
+
+	* keyboard.c: Declare Qdisabled_command_function instead of
+	Qdisabled_command_command.
+	(Fcommand_execute): Use Qdisabled_command_function instead of
+	Qdisabled_command_command.
+	(syms_of_keyboard): Ditto.
+
 2004-08-07  Luc Teirlinck  <teirllm@auburn.edu>
 
 	* keymap.c (Flocal_key_binding, Fglobal_key_binding)