[Emacs-diffs] Changes to emacs/lisp/novice.el [emacs-unicode-2]

[Miles Bader]

Index: emacs/lisp/novice.el
diff -c emacs/lisp/novice.el:1.31.8.2 emacs/lisp/novice.el:1.31.8.3
*** emacs/lisp/novice.el:1.31.8.2       Tue Aug  3 00:02:59 2004
--- emacs/lisp/novice.el        Tue Aug 10 07:46:38 2004
***************
*** 1,6 ****
  ;;; novice.el --- handling of disabled commands ("novice mode") for Emacs
  
! ;; Copyright (C) 1985, 1986, 1987, 1994, 2002 Free Software Foundation, Inc.
  
  ;; Maintainer: FSF
  ;; Keywords: internal, help
--- 1,7 ----
  ;;; novice.el --- handling of disabled commands ("novice mode") for Emacs
  
! ;; Copyright (C) 1985, 1986, 1987, 1994, 2002, 2004
! ;;   Free Software Foundation, Inc.
  
  ;; Maintainer: FSF
  ;; Keywords: internal, help
***************
*** 36,47 ****
  ;; and the keys are returned by (this-command-keys).
  
  ;;;###autoload
! (defvar disabled-command-hook 'disabled-command-hook
    "Function to call to handle disabled commands.
  If nil, the feature is disabled, i.e., all commands work normally.")
  
  ;;;###autoload
! (defun disabled-command-hook (&rest ignore)
    (let (char)
      (save-window-excursion
       (with-output-to-temp-buffer "*Help*"
--- 37,53 ----
  ;; and the keys are returned by (this-command-keys).
  
  ;;;###autoload
! (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-function (&rest ignore)
    (let (char)
      (save-window-excursion
       (with-output-to-temp-buffer "*Help*"
***************
*** 91,97 ****
         (ding)
         (message "Please type y, n, ! or SPC (the space bar): "))))
      (if (= char ?!)
!       (setq disabled-command-hook nil))
      (if (= char ?y)
        (if (and user-init-file
                 (not (string= "" user-init-file))
--- 97,103 ----
         (ding)
         (message "Please type y, n, ! or SPC (the space bar): "))))
      (if (= char ?!)
!       (setq disabled-command-function nil))
      (if (= char ?y)
        (if (and user-init-file
                 (not (string= "" user-init-file))