(function-called-at-point, variable-at-point): Use

[bpt/emacs.git] / lisp / novice.el

diff --git a/lisp/novice.el b/lisp/novice.el
index 0d23f26..d57aa22 100644 (file)
--- a/lisp/novice.el
+++ b/lisp/novice.el
@@ -18,8 +18,9 @@
 ;; GNU General Public License for more details.
 
 ;; 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, 675 Mass Ave, Cambridge, MA 02139, USA.
+;; 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.
 
 ;;; Commentary:
 
@@ -35,52 +36,61 @@
 ;; and the keys are returned by (this-command-keys).
 
 ;;;###autoload
-(setq disabled-command-hook 'disabled-command-hook)
+(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*"
-       (if (eq (aref (this-command-keys) 0)
-              (if (stringp (this-command-keys))
-                  (aref "\M-x" 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.
        (if (stringp (get this-command 'disabled))
           (princ (get this-command 'disabled)))
-       (princ (or (condition-case ()
-                     (documentation this-command)
-                   (error nil))
-                 "<< not documented >>"))
        ;; Keep only the first paragraph of the documentation.
        (save-excursion
         (set-buffer "*Help*")
-        (goto-char (point-min))
+        (goto-char (point-max))
+        (save-excursion
+          (princ (or (condition-case ()
+                         (documentation this-command)
+                       (error nil))
+                     "<< not documented >>")))
         (if (search-forward "\n\n" nil t)
             (delete-region (1- (point)) (point-max))
           (goto-char (point-max))))
        (princ "\n\n")
        (princ "You can now type
-Space to try the command just this once,
-      but leave it disabled,
+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),
+! to try it and enable all commands in this session, or
 N to do nothing (command remains disabled).")
        (save-excursion
        (set-buffer standard-output)
        (help-mode)))
-     (message "Type y, n or Space: ")
+     (message "Type y, n, ! or Space: ")
      (let ((cursor-in-echo-area t))
        (while (not (memq (setq char (downcase (read-char)))
-                        '(?  ?y ?n)))
+                        '(?! ?  ?y ?n)))
         (ding)
-        (message "Please type y, n or Space: "))))
+        (message "Please type y, n, ! or Space: "))))
+    (if (= char ?!)
+       (setq disabled-command-hook nil))
     (if (= char ?y)
        (if (and user-init-file
                 (not (string= "" user-init-file))
@@ -132,4 +142,6 @@ to future sessions."
    (insert "\n(put '" (symbol-name command) " 'disabled t)\n")
    (save-buffer)))
 
+(provide 'novice)
+
 ;;; novice.el ends here