;;; 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
;; 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:
;; 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 (= (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.
(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),
-N to do nothing (command remains disabled)."))
- (message "Type y, n or Space: ")
+! 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: ")
(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 (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)
(interactive "CEnable command: ")
(put command 'disabled nil)
(save-excursion
- (set-buffer (find-file-noselect
+ (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
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
+ (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)
(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)))
+(provide 'novice)
+
;;; novice.el ends here
HCoop / bpt / emacs.git / blobdiff