(disable-command): Don't add spurious newlines to the init file.

Reported by Dan Jacobson <jidanni@jidanni.org>.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1fbb9a57de94324ba7928dc863c1553d3146478c..5222a56d162412c00ca1da23ba134bdd8e7f87a1 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-27  Lute Kamstra  <lute@gnu.org>
+
+       * novice.el (disable-command): Don't add spurious newlines to the
+       init file.  Reported by Dan Jacobson <jidanni@jidanni.org>.
+
 2005-04-26  Jay Belanger  <belanger@truman.edu>
 
        * calc/calc-yank.el (calc-edit-finish): Make sure there is more

diff --git a/lisp/novice.el b/lisp/novice.el
index 3e63f0a7bc6766970d58a7a3a4b2accfba24e706..171285ca3f17a4411f7df1e553758de380c394c0 100644 (file)
--- a/lisp/novice.el
+++ b/lisp/novice.el
@@ -1,6 +1,6 @@
 ;;; novice.el --- handling of disabled commands ("novice mode") for Emacs
 
-;; Copyright (C) 1985, 1986, 1987, 1994, 2002, 2004
+;; Copyright (C) 1985, 1986, 1987, 1994, 2002, 2004, 2005
 ;;   Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
@@ -182,9 +182,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)