# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1294521478 18000
# Node ID fd05a6b39a42f88731d8d98351ad440602f4efc3
# Parent  afa244de82cd86b40699595a23c7cc59c441513f
Doc fix for y-or-n-p and yes-or-no-p.

* subr.el (y-or-n-p): Doc fix.
* fns.c (Fyes_or_no_p): Doc fix.

diff -r afa244de82cd -r fd05a6b39a42 lisp/ChangeLog
--- a/lisp/ChangeLog	Sat Jan 08 14:19:55 2011 -0500
+++ b/lisp/ChangeLog	Sat Jan 08 16:17:58 2011 -0500
@@ -1,5 +1,7 @@
 2011-01-08  Chong Yidong  <cyd@stupidchicken.com>
 
+	* subr.el (y-or-n-p): Doc fix.
+
 	* custom.el (custom-safe-theme-files): New defcustom.
 	(custom-theme-load-confirm): New function.
 	(load-theme): Load theme using `load', confirming with
diff -r afa244de82cd -r fd05a6b39a42 lisp/subr.el
--- a/lisp/subr.el	Sat Jan 08 14:19:55 2011 -0500
+++ b/lisp/subr.el	Sat Jan 08 16:17:58 2011 -0500
@@ -2043,8 +2043,11 @@
 
 (defun y-or-n-p (prompt &rest args)
   "Ask user a \"y or n\" question.  Return t if answer is \"y\".
-The argument PROMPT is the string to display to ask the question.
-It should end in a space; `y-or-n-p' adds `(y or n) ' to it.
+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 \"(y or n) \"
+to it.
+
 No confirmation of the answer is requested; a single character is enough.
 Also accepts Space to mean yes, or Delete to mean no.  \(Actually, it uses
 the bindings in `query-replace-map'; see the documentation of that variable
diff -r afa244de82cd -r fd05a6b39a42 src/ChangeLog
--- a/src/ChangeLog	Sat Jan 08 14:19:55 2011 -0500
+++ b/src/ChangeLog	Sat Jan 08 16:17:58 2011 -0500
@@ -1,3 +1,7 @@
+2011-01-08  Chong Yidong  <cyd@stupidchicken.com>
+
+	* fns.c (Fyes_or_no_p): Doc fix.
+
 2011-01-08  Andreas Schwab  <schwab@linux-m68k.org>
 
 	* fns.c (Fyes_or_no_p): Add usage.
diff -r afa244de82cd -r fd05a6b39a42 src/fns.c
--- a/src/fns.c	Sat Jan 08 14:19:55 2011 -0500
+++ b/src/fns.c	Sat Jan 08 16:17:58 2011 -0500
@@ -2462,10 +2462,13 @@
 
 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.
-Takes one argument, which is the string to display to ask the question.
-It 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.
+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 user must confirm the answer with RET, and can edit it until it
+has been confirmed.
 
 Under a windowing system a dialog box will be used if `last-nonmenu-event'
 is nil, and `use-dialog-box' is non-nil.