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