aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorEli Zaretskii2019-11-14 12:25:10 +0200
committerEli Zaretskii2019-11-14 12:25:10 +0200
commit75875cac2100544f7c1192fc37ea23fbe9db12d7 (patch)
tree67b70c9313fa2aac8dd6f96bc4d7c80b554b3585 /doc
parentca44f33be2e2c91dad4037c730408b2b1d4529dd (diff)
downloademacs-75875cac2100544f7c1192fc37ea23fbe9db12d7.tar.gz
emacs-75875cac2100544f7c1192fc37ea23fbe9db12d7.zip
Fix recent documentation changes
* doc/lispref/minibuf.texi (Multiple Queries): Move the reference to 'read-char-from-minibuffer' from here... * doc/lispref/commands.texi (Reading One Event): ...to here. Fix the wording of the description of 'read-char-from-minibuffer'.
Diffstat (limited to 'doc')
-rw-r--r--doc/lispref/commands.texi3
-rw-r--r--doc/lispref/minibuf.texi8
2 files changed, 5 insertions, 6 deletions
diff --git a/doc/lispref/commands.texi b/doc/lispref/commands.texi
index 0db38b7176a..0c848a80257 100644
--- a/doc/lispref/commands.texi
+++ b/doc/lispref/commands.texi
@@ -2501,6 +2501,9 @@ and key sequences read from keyboard macros being executed.
2501 The lowest level functions for command input are @code{read-event}, 2501 The lowest level functions for command input are @code{read-event},
2502@code{read-char}, and @code{read-char-exclusive}. 2502@code{read-char}, and @code{read-char-exclusive}.
2503 2503
2504If you need a function to read a character using the minibuffer, use
2505@code{read-char-from-minibuffer} (@pxref{Multiple Queries}).
2506
2504@defun read-event &optional prompt inherit-input-method seconds 2507@defun read-event &optional prompt inherit-input-method seconds
2505This function reads and returns the next event of command input, 2508This function reads and returns the next event of command input,
2506waiting if necessary until an event is available. 2509waiting if necessary until an event is available.
diff --git a/doc/lispref/minibuf.texi b/doc/lispref/minibuf.texi
index c87723df1f6..4a218fe7378 100644
--- a/doc/lispref/minibuf.texi
+++ b/doc/lispref/minibuf.texi
@@ -2253,16 +2253,12 @@ Here is an example of using this function:
2253@end lisp 2253@end lisp
2254@end defun 2254@end defun
2255 2255
2256If you need a function to read a character like @code{read-char} or
2257@code{read-char-choice} (@pxref{Reading One Event}) but using the
2258minibuffer, use @code{read-char-from-minibuffer}.
2259
2260@defun read-char-from-minibuffer prompt &optional chars history 2256@defun read-char-from-minibuffer prompt &optional chars history
2261This function uses the minibuffer to read and return a single 2257This function uses the minibuffer to read and return a single
2262character. Optionally, it ignores any input that is not a member of 2258character. Optionally, it ignores any input that is not a member of
2263@var{chars}, a list of accepted characters. The @var{history} 2259@var{chars}, a list of accepted characters. The @var{history}
2264argument specifies the history list symbol to use; if is omitted or 2260argument specifies the history list symbol to use; if it is omitted or
2265@code{nil}, it doesn't use the history. 2261@code{nil}, this function doesn't use the history.
2266@end defun 2262@end defun
2267 2263
2268@node Reading a Password 2264@node Reading a Password