diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2011-01-09 09:26:29 -0500 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2011-01-09 09:26:29 -0500 |
| commit | 973f1f2a8155542e97b9043ef7d233a93212a0fa (patch) | |
| tree | c6969c7393ab4d75a802871aaccc424d652a4bbc /lisp | |
| parent | b7617f6d8b78434a5b208df8a17a8cf8d68b4d7c (diff) | |
| download | emacs-973f1f2a8155542e97b9043ef7d233a93212a0fa.tar.gz | |
* lisp/subr.el (read-char-choice): Use read-key. Suggested by Stefan.
* src/fns.c (Fyes_or_no_p): Minor doc fix.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/subr.el | 2 |
2 files changed, 3 insertions, 1 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) |