Mercurial > emacs
comparison src/fns.c @ 112321:dc74e58f6b0b
Merge from mainline.
author | Paul Eggert <eggert@cs.ucla.edu> |
---|---|
date | Tue, 11 Jan 2011 21:57:19 -0800 |
parents | 7df2e30d72ec 1c4c22434b0d |
children | 56d3e9c28eb0 |
comparison
equal
deleted
inserted
replaced
112320:a4a6f5f8f078 | 112321:dc74e58f6b0b |
---|---|
2458 | 2458 |
2459 /* Anything that calls this function must protect from GC! */ | 2459 /* Anything that calls this function must protect from GC! */ |
2460 | 2460 |
2461 DEFUN ("yes-or-no-p", Fyes_or_no_p, Syes_or_no_p, 1, MANY, 0, | 2461 DEFUN ("yes-or-no-p", Fyes_or_no_p, Syes_or_no_p, 1, MANY, 0, |
2462 doc: /* Ask user a yes-or-no question. Return t if answer is yes. | 2462 doc: /* Ask user a yes-or-no question. Return t if answer is yes. |
2463 Takes one argument, which is the string to display to ask the question. | 2463 The string to display to ask the question is obtained by |
2464 It should end in a space; `yes-or-no-p' adds `(yes or no) ' to it. | 2464 formatting the string PROMPT with arguments ARGS (see `format'). |
2465 The user must confirm the answer with RET, | 2465 The result should end in a space; `yes-or-no-p' adds |
2466 and can edit it until it has been confirmed. | 2466 \"(yes or no) \" to it. |
2467 | |
2468 The user must confirm the answer with RET, and can edit it until it | |
2469 has been confirmed. | |
2467 | 2470 |
2468 Under a windowing system a dialog box will be used if `last-nonmenu-event' | 2471 Under a windowing system a dialog box will be used if `last-nonmenu-event' |
2469 is nil, and `use-dialog-box' is non-nil. | 2472 is nil, and `use-dialog-box' is non-nil. |
2470 usage: (yes-or-no-p PROMPT &rest ARGS) */) | 2473 usage: (yes-or-no-p PROMPT &rest ARGS) */) |
2471 (int nargs, Lisp_Object *args) | 2474 (int nargs, Lisp_Object *args) |