diff options
| author | Chong Yidong | 2011-01-08 16:17:58 -0500 |
|---|---|---|
| committer | Chong Yidong | 2011-01-08 16:17:58 -0500 |
| commit | 3d91e302868dfb6bf12e697f81167447ce4a7250 (patch) | |
| tree | 890b932020a3984ae076361f026a2695db03fa7a /src | |
| parent | 278f68456b8c25fff6d2274476cdc8ee3609f68b (diff) | |
| download | emacs-3d91e302868dfb6bf12e697f81167447ce4a7250.tar.gz emacs-3d91e302868dfb6bf12e697f81167447ce4a7250.zip | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/fns.c | 11 |
2 files changed, 11 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index aad0050f0bd..34154e3bf28 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2011-01-08 Chong Yidong <cyd@stupidchicken.com> | ||
| 2 | |||
| 3 | * fns.c (Fyes_or_no_p): Doc fix. | ||
| 4 | |||
| 1 | 2011-01-08 Andreas Schwab <schwab@linux-m68k.org> | 5 | 2011-01-08 Andreas Schwab <schwab@linux-m68k.org> |
| 2 | 6 | ||
| 3 | * fns.c (Fyes_or_no_p): Add usage. | 7 | * fns.c (Fyes_or_no_p): Add usage. |
| @@ -2462,10 +2462,13 @@ do_yes_or_no_p (Lisp_Object prompt) | |||
| 2462 | 2462 | ||
| 2463 | DEFUN ("yes-or-no-p", Fyes_or_no_p, Syes_or_no_p, 1, MANY, 0, | 2463 | DEFUN ("yes-or-no-p", Fyes_or_no_p, Syes_or_no_p, 1, MANY, 0, |
| 2464 | doc: /* Ask user a yes-or-no question. Return t if answer is yes. | 2464 | doc: /* Ask user a yes-or-no question. Return t if answer is yes. |
| 2465 | Takes one argument, which is the string to display to ask the question. | 2465 | The string to display to ask the question is obtained by |
| 2466 | It should end in a space; `yes-or-no-p' adds `(yes or no) ' to it. | 2466 | formatting the string PROMPT with arguments ARGS (see `format'). |
| 2467 | The user must confirm the answer with RET, | 2467 | The result should end in a space; `y-or-n-p' adds \"(yes or no) \" |
| 2468 | and can edit it until it has been confirmed. | 2468 | to it. |
| 2469 | |||
| 2470 | The user must confirm the answer with RET, and can edit it until it | ||
| 2471 | has been confirmed. | ||
| 2469 | 2472 | ||
| 2470 | Under a windowing system a dialog box will be used if `last-nonmenu-event' | 2473 | Under a windowing system a dialog box will be used if `last-nonmenu-event' |
| 2471 | is nil, and `use-dialog-box' is non-nil. | 2474 | is nil, and `use-dialog-box' is non-nil. |