# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1294583189 18000
# Node ID 1c4c22434b0d03b0fa36906ba84887358bb9b543
# Parent  2b3091d1425544704f9a4248e6729d293d1726ed
* lisp/subr.el (read-char-choice): Use read-key.  Suggested by Stefan.

* src/fns.c (Fyes_or_no_p): Minor doc fix.

diff -r 2b3091d14255 -r 1c4c22434b0d lisp/ChangeLog
--- a/lisp/ChangeLog	Sat Jan 08 23:59:56 2011 -0500
+++ b/lisp/ChangeLog	Sun Jan 09 09:26:29 2011 -0500
@@ -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 -r 2b3091d14255 -r 1c4c22434b0d lisp/subr.el
--- a/lisp/subr.el	Sat Jan 08 23:59:56 2011 -0500
+++ b/lisp/subr.el	Sun Jan 09 09:26:29 2011 -0500
@@ -1985,7 +1985,7 @@
       (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 -r 2b3091d14255 -r 1c4c22434b0d src/fns.c
--- a/src/fns.c	Sat Jan 08 23:59:56 2011 -0500
+++ b/src/fns.c	Sun Jan 09 09:26:29 2011 -0500
@@ -2464,8 +2464,8 @@
        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.