procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs

Browse source
This commit is contained in:
Eli Zaretskii 2023-05-12 14:07:29 +03:00
commit e535494491
3 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
doc/lispref/minibuf.texi
View file

@ -2200,6 +2200,9 @@ the expected answers (@kbd{y}, @kbd{n}, @kbd{@key{SPC}},
@kbd{@key{DEL}}, or something that quits), the function responds @kbd{@key{DEL}}, or something that quits), the function responds
@samp{Please answer y or n.}, and repeats the request. @samp{Please answer y or n.}, and repeats the request.
If @var{prompt} is a non-empty string, and it ends with a non-space
character, a @samp{SPC} character will be appended to it.
This function actually uses the minibuffer, but does not allow editing This function actually uses the minibuffer, but does not allow editing
of the answer. The cursor moves to the minibuffer while the question of the answer. The cursor moves to the minibuffer while the question
is being asked. is being asked.
@ -2240,6 +2243,9 @@ minibuffer, followed by the value of @code{yes-or-no-prompt} @w{(default
responses; otherwise, the function responds @w{@samp{Please answer yes or responses; otherwise, the function responds @w{@samp{Please answer yes or
no.}}, waits about two seconds and repeats the request. no.}}, waits about two seconds and repeats the request.
If @var{prompt} is a non-empty string, and it ends with a non-space
character, a @samp{SPC} character will be appended to it.
@code{yes-or-no-p} requires more work from the user than @code{yes-or-no-p} requires more work from the user than
@code{y-or-n-p} and is appropriate for more crucial decisions. @code{y-or-n-p} and is appropriate for more crucial decisions.

4
lisp/subr.el
View file

@ -3590,7 +3590,9 @@ confusing to some users.")
Return t if answer is \"y\" and nil if it is \"n\". Return t if answer is \"y\" and nil if it is \"n\".
PROMPT is the string to display to ask the question; `y-or-n-p' PROMPT is the string to display to ask the question; `y-or-n-p'
adds \"(y or n) \" to it. adds \"(y or n) \" to it. If PROMPT is a non-empty string, and
it ends with a non-space character, a space character will be
appended to it.
If you bind the variable `help-form' to a non-nil value If you bind the variable `help-form' to a non-nil value
while calling this function, then pressing `help-char' while calling this function, then pressing `help-char'

11
src/fns.c
View file

@ -26,6 +26,7 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. */
#include <intprops.h> #include <intprops.h>
#include <vla.h> #include <vla.h>
#include <errno.h> #include <errno.h>
#include <ctype.h>
#include "lisp.h" #include "lisp.h"
#include "bignum.h" #include "bignum.h"
@ -3202,7 +3203,9 @@ DEFUN ("yes-or-no-p", Fyes_or_no_p, Syes_or_no_p, 1, 1, 0,
Return t if answer is yes, and nil if the answer is no. Return t if answer is yes, and nil if the answer is no.
PROMPT is the string to display to ask the question; `yes-or-no-p' PROMPT is the string to display to ask the question; `yes-or-no-p'
appends `yes-or-no-prompt' (default \"(yes or no) \") to it. appends `yes-or-no-prompt' (default \"(yes or no) \") to it. If
PROMPT is a non-empty string, and it ends with a non-space character,
a space character will be appended to it.
The user must confirm the answer with RET, and can edit it until it The user must confirm the answer with RET, and can edit it until it
has been confirmed. has been confirmed.
@ -3234,6 +3237,12 @@ if `last-nonmenu-event' is nil, and `use-dialog-box' is non-nil. */)
if (use_short_answers) if (use_short_answers)
return call1 (intern ("y-or-n-p"), prompt); return call1 (intern ("y-or-n-p"), prompt);
{
char *s = SSDATA (prompt);
ptrdiff_t len = strlen (s);
if ((len > 0) && !isspace (s[len - 1]))
prompt = CALLN (Fconcat, prompt, build_string (" "));
}
prompt = CALLN (Fconcat, prompt, Vyes_or_no_prompt); prompt = CALLN (Fconcat, prompt, Vyes_or_no_prompt);
specpdl_ref count = SPECPDL_INDEX (); specpdl_ref count = SPECPDL_INDEX ();