diff options
| author | Eli Zaretskii | 2023-05-12 14:07:29 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2023-05-12 14:07:29 +0300 |
| commit | e535494491cb6266260e5adcbcbc9b7cd76cab2f (patch) | |
| tree | 39736c347fc23cfbccd80bede0680b724f73e8e8 /lisp | |
| parent | 0b39e4daee4383d9e535148a973e0d5701125ada (diff) | |
| parent | cbb59267c757b747c48a2690f96073614e8b4fd4 (diff) | |
| download | emacs-e535494491cb6266260e5adcbcbc9b7cd76cab2f.tar.gz emacs-e535494491cb6266260e5adcbcbc9b7cd76cab2f.zip | |
Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/subr.el | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/subr.el b/lisp/subr.el index 0501fc67a3e..a52abb38772 100644 --- a/lisp/subr.el +++ b/lisp/subr.el | |||
| @@ -3590,7 +3590,9 @@ confusing to some users.") | |||
| 3590 | Return t if answer is \"y\" and nil if it is \"n\". | 3590 | Return t if answer is \"y\" and nil if it is \"n\". |
| 3591 | 3591 | ||
| 3592 | PROMPT is the string to display to ask the question; `y-or-n-p' | 3592 | PROMPT is the string to display to ask the question; `y-or-n-p' |
| 3593 | adds \"(y or n) \" to it. | 3593 | adds \"(y or n) \" to it. If PROMPT is a non-empty string, and |
| 3594 | it ends with a non-space character, a space character will be | ||
| 3595 | appended to it. | ||
| 3594 | 3596 | ||
| 3595 | If you bind the variable `help-form' to a non-nil value | 3597 | If you bind the variable `help-form' to a non-nil value |
| 3596 | while calling this function, then pressing `help-char' | 3598 | while calling this function, then pressing `help-char' |