# HG changeset patch
# User Luc Teirlinck <teirllm@auburn.edu>
# Date 1091981114 0
# Node ID c8c558c4f4a7b456a038bb021fd74086d6a21a00
# Parent  46ea95c2b12c3b067c3f8abb15c939291f5c438b
(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 namechange of the variable.

diff -r 46ea95c2b12c -r c8c558c4f4a7 lisp/novice.el
--- a/lisp/novice.el	Sun Aug 08 15:49:14 2004 +0000
+++ b/lisp/novice.el	Sun Aug 08 16:05:14 2004 +0000
@@ -1,6 +1,7 @@
 ;;; novice.el --- handling of disabled commands ("novice mode") for Emacs
 
-;; Copyright (C) 1985, 1986, 1987, 1994, 2002 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1986, 1987, 1994, 2002, 2004
+;;   Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: internal, help
@@ -36,12 +37,17 @@
 ;; and the keys are returned by (this-command-keys).
 
 ;;;###autoload
-(defvar disabled-command-hook 'disabled-command-hook
+(defvar disabled-command-function 'disabled-command-function
   "Function to call to handle disabled commands.
 If nil, the feature is disabled, i.e., all commands work normally.")
 
+(defvaralias 'disabled-command-hook 'disabled-command-function)
+(make-obsolete-variable
+ 'disabled-command-hook
+ "use the variable `disabled-command-function' instead." "21.4")
+
 ;;;###autoload
-(defun disabled-command-hook (&rest ignore)
+(defun disabled-command-function (&rest ignore)
   (let (char)
     (save-window-excursion
      (with-output-to-temp-buffer "*Help*"
@@ -91,7 +97,7 @@
 	 (ding)
 	 (message "Please type y, n, ! or SPC (the space bar): "))))
     (if (= char ?!)
-	(setq disabled-command-hook nil))
+	(setq disabled-command-function nil))
     (if (= char ?y)
 	(if (and user-init-file
 		 (not (string= "" user-init-file))