[Emacs-diffs] /srv/bzr/emacs/trunk r102794: Doc fix for y-or-n-p and yes-or-no-p.

[Chong Yidong]

------------------------------------------------------------
revno: 102794
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sat 2011-01-08 16:17:58 -0500
message:
  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.
modified:
  lisp/ChangeLog
  lisp/subr.el
  src/ChangeLog
  src/fns.c

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-01-08 19:19:55 +0000
+++ b/lisp/ChangeLog    2011-01-08 21:17:58 +0000
@@ -1,5 +1,7 @@
 2011-01-08  Chong Yidong  <address@hidden>
 
+       * 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

=== modified file 'lisp/subr.el'
--- a/lisp/subr.el      2011-01-08 19:17:23 +0000
+++ b/lisp/subr.el      2011-01-08 21:17:58 +0000
@@ -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

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-01-08 13:32:31 +0000
+++ b/src/ChangeLog     2011-01-08 21:17:58 +0000
@@ -1,3 +1,7 @@
+2011-01-08  Chong Yidong  <address@hidden>
+
+       * fns.c (Fyes_or_no_p): Doc fix.
+
 2011-01-08  Andreas Schwab  <address@hidden>
 
        * fns.c (Fyes_or_no_p): Add usage.

=== modified file 'src/fns.c'
--- a/src/fns.c 2011-01-08 13:32:31 +0000
+++ b/src/fns.c 2011-01-08 21:17:58 +0000
@@ -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.