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

; * lisp/subr.el (read-char-choice): Fix last change.

Browse source
This commit is contained in:
Eli Zaretskii 2023-03-28 21:31:51 +03:00
parent c1eac5b658
commit 3965c65d5e
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
lisp/subr.el
View file

@ -3210,13 +3210,15 @@ confusing to some users.")
"Read and return one of the characters in CHARS, prompting with PROMPT. "Read and return one of the characters in CHARS, prompting with PROMPT.
CHARS should be a list of single characters. CHARS should be a list of single characters.
The function discards any input character that is not one of CHARS, The function discards any input character that is not one of CHARS,
and shows a message to the effect that it is not one of the expected and by default shows a message to the effect that it is not one of
charcaters. the expected characters.
By default, use the minibuffer to read the key non-modally (see By default, this function uses the minibuffer to read the key
`read-char-from-minibuffer'). But if `read-char-choice-use-read-key' non-modally (see `read-char-from-minibuffer'), and the optional
is non-nil, the modal `read-key' function is used instead (see argument INHIBIT-KEYBOARD-QUIT is ignored. However, if
`read-char-choice-with-read-key')." `read-char-choice-use-read-key' is non-nil, the modal `read-key'
function is used instead (see `read-char-choice-with-read-key'),
and INHIBIT-KEYBOARD-QUIT is passed to it."
(if (not read-char-choice-use-read-key) (if (not read-char-choice-use-read-key)
(read-char-from-minibuffer prompt chars) (read-char-from-minibuffer prompt chars)
(read-char-choice-with-read-key prompt chars inhibit-keyboard-quit))) (read-char-choice-with-read-key prompt chars inhibit-keyboard-quit)))