(bookmark-bmenu-2-window): go to correct position as well as

[gnu-emacs] / lisp / novice.el

diff --git a/lisp/novice.el b/lisp/novice.el
index b874754920959f6d198d31cfe1e17efed809da13..1a7a5075305a08da9c75c08a4feef44474ee6403 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 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1986, 1987, 1994 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: internal, help
@@ -42,11 +42,18 @@
   (let (char)
     (save-window-excursion
      (with-output-to-temp-buffer "*Help*"
-       (if (= (aref (this-command-keys) 0) ?\M-x)
-          (princ "You have invoked the disabled command ")
-        (princ "You have typed ")
-        (princ (key-description (this-command-keys)))
-        (princ ", invoking disabled command "))
+       (let ((keys (this-command-keys)))
+        (if (or (eq (aref keys 0)
+                    (if (stringp keys)
+                        (aref "\M-x" 0)
+                      ?\M-x))
+                (and (>= (length keys) 2)
+                     (eq (aref keys 0) meta-prefix-char)
+                     (eq (aref keys 1) ?x)))
+            (princ "You have invoked the disabled command ")
+          (princ "You have typed ")
+          (princ (key-description keys))
+          (princ ", invoking disabled command ")))
        (princ this-command)
        (princ ":\n")
        ;; Print any special message saying why the command is disabled.
@@ -68,7 +75,10 @@
 Space to try the command just this once,
       but leave it disabled,
 Y to try it and enable it (no questions if you use it again),
-N to do nothing (command remains disabled)."))
+N to do nothing (command remains disabled).")
+       (save-excursion
+       (set-buffer standard-output)
+       (help-mode)))
      (message "Type y, n or Space: ")
      (let ((cursor-in-echo-area t))
        (while (not (memq (setq char (downcase (read-char)))
@@ -76,7 +86,9 @@ N to do nothing (command remains disabled)."))
         (ding)
         (message "Please type y, n or Space: "))))
     (if (= char ?y)
-       (if (y-or-n-p "Enable command for future editing sessions also? ")
+       (if (and user-init-file
+                (not (string= "" user-init-file))
+                (y-or-n-p "Enable command for future editing sessions also? "))
            (enable-command this-command)
          (put this-command 'disabled nil)))
     (if (/= char ?n)
@@ -90,15 +102,17 @@ to future sessions."
   (interactive "CEnable command: ")
   (put command 'disabled nil)
   (save-excursion
-   (set-buffer (find-file-noselect (substitute-in-file-name "~/.emacs")))
+   (set-buffer (find-file-noselect
+               (substitute-in-file-name user-init-file)))
    (goto-char (point-min))
    (if (search-forward (concat "(put '" (symbol-name command) " ") nil t)
        (delete-region
        (progn (beginning-of-line) (point))
-       (progn (forward-line 1) (point)))
-     ;; Must have been disabled by default.
-     (goto-char (point-max))
-     (insert "\n(put '" (symbol-name command) " 'disabled nil)\n"))
+       (progn (forward-line 1) (point))))
+   ;; Explicitly enable, in case this command is disabled by default
+   ;; or in case the code we deleted was actually a comment.
+   (goto-char (point-max))
+   (insert "\n(put '" (symbol-name command) " 'disabled nil)\n")
    (save-buffer)))
 
 ;;;###autoload
@@ -107,16 +121,19 @@ to future sessions."
 The user's .emacs file is altered so that this will apply
 to future sessions."
   (interactive "CDisable command: ")
+  (if (not (commandp command))
+      (error "Invalid command name `%s'" command))
   (put command 'disabled t)
   (save-excursion
-   (set-buffer (find-file-noselect (substitute-in-file-name "~/.emacs")))
+   (set-buffer (find-file-noselect
+               (substitute-in-file-name user-init-file)))
    (goto-char (point-min))
    (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 "(put '" (symbol-name command) " 'disabled t)\n")
+   (insert "\n(put '" (symbol-name command) " 'disabled t)\n")
    (save-buffer)))
 
 ;;; novice.el ends here