X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/72287c23ef993fc3248deba670da1bab4882f3f7..9416ae448e61ef1478a7e7e07bdfa25273095811:/lisp/novice.el

diff --git a/lisp/novice.el b/lisp/novice.el
index 3e63f0a7bc..7fff480e2c 100644
--- a/lisp/novice.el
+++ b/lisp/novice.el
@@ -1,7 +1,7 @@
 ;;; novice.el --- handling of disabled commands ("novice mode") for Emacs
 
-;; Copyright (C) 1985, 1986, 1987, 1994, 2002, 2004
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1986, 1987, 1994, 2002, 2003, 2004,
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: internal, help
@@ -20,8 +20,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -42,9 +42,10 @@
 If nil, the feature is disabled, i.e., all commands work normally.")
 
 ;;;###autoload
-(defvaralias 'disabled-command-hook 'disabled-command-function)
-;;;###autoload (make-obsolete-variable 'disabled-command-hook 'disabled-command-function "22.1")
+(define-obsolete-variable-alias 'disabled-command-hook 'disabled-command-function "22.1")
 
+;; It is ok here to assume that this-command is a symbol
+;; because we won't get called otherwise.
 ;;;###autoload
 (defun disabled-command-function (&rest ignore)
   (let (char)
@@ -182,9 +183,10 @@ to future sessions."
       (if (search-forward (concat "(put '" (symbol-name command) " ") nil t)
 	  (delete-region
 	   (progn (beginning-of-line) (point))
-	   (progn (forward-line 1) (point))))
-      (goto-char (point-max))
-      (insert "\n(put '" (symbol-name command) " 'disabled t)\n")
+	   (progn (forward-line 1) (point)))
+	(goto-char (point-max))
+	(insert ?\n))
+      (insert "(put '" (symbol-name command) " 'disabled t)\n")
       (save-buffer))))
 
 (provide 'novice)