From: Eli Zaretskii Date: Tue, 28 Mar 2023 18:31:51 +0000 (+0300) Subject: ; * lisp/subr.el (read-char-choice): Fix last change. X-Git-Tag: emacs-29.0.90~68 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3965c65d5e28e0efdfa693046f6a2059e74465f9;p=emacs.git ; * lisp/subr.el (read-char-choice): Fix last change. --- diff --git a/lisp/subr.el b/lisp/subr.el index a9d93e5fe5e..f82826e819c 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -3210,13 +3210,15 @@ confusing to some users.") "Read and return one of the characters in CHARS, prompting with PROMPT. CHARS should be a list of single characters. 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 -charcaters. - -By default, use the minibuffer to read the key non-modally (see -`read-char-from-minibuffer'). But if `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 by default shows a message to the effect that it is not one of +the expected characters. + +By default, this function uses the minibuffer to read the key +non-modally (see `read-char-from-minibuffer'), and the optional +argument INHIBIT-KEYBOARD-QUIT is ignored. However, if +`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) (read-char-from-minibuffer prompt chars) (read-char-choice-with-read-key prompt chars inhibit-keyboard-quit)))