diff options
| author | Stefan Kangas <stefankangas@gmail.com> | 2023-01-05 06:30:20 +0100 |
|---|---|---|
| committer | Stefan Kangas <stefankangas@gmail.com> | 2023-01-05 06:30:20 +0100 |
| commit | e1b2446b2e944acbad6e27f28ee639caa24af198 (patch) | |
| tree | ce4b6927eb14dcd48fac694a105344d315e4de68 /src/fns.c | |
| parent | 1ddd31bf9843c0453af92a09f98935cfcbb4e250 (diff) | |
| parent | 92f753dc19010cf4075db5e6bcedcc5ac0fc2e41 (diff) | |
| download | emacs-e1b2446b2e944acbad6e27f28ee639caa24af198.tar.gz | |
Merge from origin/emacs-29
92f753dc190 ; * etc/NEWS: Fix wording in last change.
cef875f6c51 ; * etc/NEWS: Instructions for builds without tree-sitter...
8d530ca6542 ; Fix documentation of y-or-n-p/yes-or-no-p
c18878ee0a2 Fix bug in Tramp multi-hop
7eed8e050a9 * lisp/files.el (find-sibling-rules): Fix docstring.
6b5831c6964 Tree-sitter doc fixes (bug#60524)
651927ac391 ; Fix function reference in comment in c-ts-mode.el (bug#...
c786afcbb9f Fontify C++ function definitions in c-ts-mode (bug#60529)
# Conflicts:
# etc/NEWS
Diffstat (limited to 'src/fns.c')
| -rw-r--r-- | src/fns.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/fns.c b/src/fns.c index 0dc31aec373..bbc9a7f9621 100644 --- a/src/fns.c +++ b/src/fns.c @@ -3173,8 +3173,7 @@ 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. PROMPT is the string to display to ask the question; `yes-or-no-p' -adds \"(yes or no) \" to it. It does not need to end in space, but if -it does up to one space will be removed. +adds \"(yes or no) \" to it. The user must confirm the answer with RET, and can edit it until it has been confirmed. |