aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2020-03-07 13:40:10 +0200
committerEli Zaretskii2020-03-07 13:40:10 +0200
commitfdbe7cacfb1e56e8a2115971ad2a09cdd1b0fd85 (patch)
treec0dccbfa8974dc412d7d837cb5e8841a5af84a9f
parent10c58356e4e7ab1bae9b5fe1c1304e1f8dc82f83 (diff)
downloademacs-fdbe7cacfb1e56e8a2115971ad2a09cdd1b0fd85.tar.gz
emacs-fdbe7cacfb1e56e8a2115971ad2a09cdd1b0fd85.zip
Document the changes in 'read-answer'
* doc/lispref/minibuf.texi (Multiple Queries): Document the fact that 'read-answer' can now accept non-character input events.
-rw-r--r--doc/lispref/minibuf.texi20
-rw-r--r--etc/NEWS1
2 files changed, 11 insertions, 10 deletions
diff --git a/doc/lispref/minibuf.texi b/doc/lispref/minibuf.texi
index 1266cf8ef65..c1615993f5e 100644
--- a/doc/lispref/minibuf.texi
+++ b/doc/lispref/minibuf.texi
@@ -2227,16 +2227,16 @@ the end of @var{question}. The possible responses are provided in
2227@noindent 2227@noindent
2228where @var{long-answer} is the complete text of the user response, a 2228where @var{long-answer} is the complete text of the user response, a
2229string; @var{short-answer} is a short form of the same response, a 2229string; @var{short-answer} is a short form of the same response, a
2230single character; and @var{help-message} is the text that describes 2230single character or a function key; and @var{help-message} is the text
2231the meaning of the answer. If the variable @code{read-answer-short} 2231that describes the meaning of the answer. If the variable
2232is non-@code{nil}, the prompt will show the short variants of the 2232@code{read-answer-short} is non-@code{nil}, the prompt will show the
2233possible answers and the user is expected to type the single 2233short variants of the possible answers and the user is expected to
2234characters shown in the prompt; otherwise the prompt will show the 2234type the single characters/keys shown in the prompt; otherwise the
2235long variants of the answers, and the user is expected to type the 2235prompt will show the long variants of the answers, and the user is
2236full text of one of the answers and end by pressing @key{RET}. If 2236expected to type the full text of one of the answers and end by
2237@code{use-dialog-box} is non-@code{nil}, and this function was invoked 2237pressing @key{RET}. If @code{use-dialog-box} is non-@code{nil}, and
2238by mouse events, the question and the answers will be displayed in a 2238this function was invoked by mouse events, the question and the
2239GUI dialog box. 2239answers will be displayed in a GUI dialog box.
2240 2240
2241The function returns the text of the @var{long-answer} selected by the 2241The function returns the text of the @var{long-answer} selected by the
2242user, regardless of whether long or short answers were shown in the 2242user, regardless of whether long or short answers were shown in the
diff --git a/etc/NEWS b/etc/NEWS
index 2d719fb7a5b..08bd2af1595 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -347,6 +347,7 @@ The default value is 30000, as the previously hard-coded threshold.
347+++ 347+++
348** The function 'read-passwd' uses "*" as default character to hide passwords. 348** The function 'read-passwd' uses "*" as default character to hide passwords.
349 349
350+++
350** The function 'read-answer' now accepts not only single character 351** The function 'read-answer' now accepts not only single character
351answers, but also function keys like 'F1', character events such as 352answers, but also function keys like 'F1', character events such as
352'C-M-h', and control characters like 'C-h'. 353'C-M-h', and control characters like 'C-h'.