diff options
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/subr.el | 2 | ||||
| -rw-r--r-- | src/fns.c | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c09c89a5efa..6da2fe1abb3 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,7 @@ 2011-01-09 Chong Yidong <cyd@stupidchicken.com> + * subr.el (read-char-choice): Use read-key. + * custom.el (custom-safe-themes): Rename from custom-safe-theme-files. Add :risky tag. (load-theme, custom-theme-load-confirm): Save sha1 hashes to diff --git a/lisp/subr.el b/lisp/subr.el index 8294ab17782..536e6c262bd 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -1985,7 +1985,7 @@ keyboard-quit events while waiting for a valid input." (unless (get-text-property 0 'face prompt) (setq prompt (propertize prompt 'face 'minibuffer-prompt))) (setq char (let ((inhibit-quit inhibit-keyboard-quit)) - (read-event prompt))) + (read-key prompt))) (cond ((not (numberp char))) ((memq char chars) diff --git a/src/fns.c b/src/fns.c index e59bf212105..3b0a19e9239 100644 --- a/src/fns.c +++ b/src/fns.c @@ -2464,8 +2464,8 @@ DEFUN ("yes-or-no-p", Fyes_or_no_p, Syes_or_no_p, 1, MANY, 0, doc: /* Ask user a yes-or-no question. Return t if answer is yes. The string to display to ask the question is obtained by formatting the string PROMPT with arguments ARGS (see `format'). -The result should end in a space; `y-or-n-p' adds \"(yes or no) \" -to it. +The result should end in a space; `yes-or-no-p' adds +\"(yes or no) \" to it. The user must confirm the answer with RET, and can edit it until it has been confirmed. |