summaryrefslogtreecommitdiff
path: root/src/callint.c
diff options
context:
space:
mode:
authorPo Lu <luangruo@yahoo.com>2023-07-21 21:23:35 +0800
committerPo Lu <luangruo@yahoo.com>2023-07-21 21:23:35 +0800
commitae174f266d70f2d722545e77d3f85dd7d3f09a68 (patch)
tree5e101bcf2b9836ca4f86108ff24e1ab1b95c4ae7 /src/callint.c
parent2df3f89014a39342c402637296ee88e3749f4918 (diff)
downloademacs-ae174f266d70f2d722545e77d3f85dd7d3f09a68.tar.gz
Improve touch screen and text conversion behavior of many commands
* doc/lispref/commands.texi (Key Sequence Input): Document new argument to `read-key-sequence' etc. * lisp/help-macro.el (make-help-screen): * lisp/subr.el (read-key, read-char-choice-with-read-key): Disable text conversion and display the OSK before reading a key sequence. * lisp/touch-screen.el (touch-screen-window-selection-changed): Only cancel the minibuffer OSK timer. (touch-screen-handle-point-up): Update comment accordingly. * src/keyboard.c (command_loop_1, read_menu_command) (read_key_sequence, read_key_sequence_vs, Fread_key_sequence) (Fread_key_sequence_vector): New arg DISABLE_TEXT_CONVERSION. All callers changed.
Diffstat (limited to 'src/callint.c')
-rw-r--r--src/callint.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/callint.c b/src/callint.c
index d8d2b278458..00e9a080654 100644
--- a/src/callint.c
+++ b/src/callint.c
@@ -537,7 +537,8 @@ invoke it (via an `interactive' spec that contains, for instance, an
make_fixnum (SCHARS (callint_message)),
Qface, Qminibuffer_prompt, callint_message);
args[i] = Fread_key_sequence (callint_message,
- Qnil, Qnil, Qnil, Qnil);
+ Qnil, Qnil, Qnil, Qnil,
+ Qnil);
unbind_to (speccount1, Qnil);
visargs[i] = Fkey_description (args[i], Qnil);
@@ -567,7 +568,8 @@ invoke it (via an `interactive' spec that contains, for instance, an
make_fixnum (SCHARS (callint_message)),
Qface, Qminibuffer_prompt, callint_message);
args[i] = Fread_key_sequence_vector (callint_message,
- Qnil, Qt, Qnil, Qnil);
+ Qnil, Qt, Qnil, Qnil,
+ Qnil);
visargs[i] = Fkey_description (args[i], Qnil);
unbind_to (speccount1, Qnil);