diff options
| author | Pavel Janík <Pavel@Janik.cz> | 2002-03-20 23:08:58 +0000 |
|---|---|---|
| committer | Pavel Janík <Pavel@Janik.cz> | 2002-03-20 23:08:58 +0000 |
| commit | eb4cb84faf64f54b7418a60fb5c7bb3c1fd30a3f (patch) | |
| tree | 7286e2af3c806a5b69e02d1005fd3952d01db56b /lisp | |
| parent | 47bcdab2b64387ed7dd97d784c36c08e2f4bd9e7 (diff) | |
| download | emacs-eb4cb84faf64f54b7418a60fb5c7bb3c1fd30a3f.tar.gz | |
(disabled-command-hook): Clarify output text to match prompt.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/novice.el | 10 |
2 files changed, 10 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d800704bf78..c9294e0a7d3 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2002-03-21 Pavel Jan,Bm(Bk <Pavel@Janik.cz> + + * novice.el (disabled-command-hook): Clarify output text to match + prompt. + 2002-03-20 Jason Rumney <jasonr@gnu.org> * frame.el (display-images-p): Do not explicitly check display type. diff --git a/lisp/novice.el b/lisp/novice.el index c76637fcd06..32dfae3a205 100644 --- 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 Free Software Foundation, Inc. +;; Copyright (C) 1985, 1986, 1987, 1994, 2002 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: internal, help @@ -77,19 +77,19 @@ If nil, the feature is disabled, i.e., all commands work normally.") (indent-rigidly start (point) 3)))) (princ "\n\nDo you want to use this command anyway?\n\n") (princ "You can now type -Y to try it and enable it (no questions if you use it again). -N to cancel--don't try the command, and it remains disabled. +y to try it and enable it (no questions if you use it again). +n to cancel--don't try the command, and it remains disabled. SPC to try the command just this once, but leave it disabled. ! to try it, and enable all disabled commands for this session only.") (save-excursion (set-buffer standard-output) (help-mode))) - (message "Type y, n, ! or Space: ") + (message "Type y, n, ! or SPC (the space bar): ") (let ((cursor-in-echo-area t)) (while (not (memq (setq char (downcase (read-char))) '(?! ? ?y ?n))) (ding) - (message "Please type y, n, ! or Space: ")))) + (message "Please type y, n, ! or SPC (the space bar): ")))) (if (= char ?!) (setq disabled-command-hook nil)) (if (= char ?y) |