aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorzeertzjq <zeertzjq@outlook.com>2022-06-07 12:41:18 +0800
committerGitHub <noreply@github.com>2022-06-07 12:41:18 +0800
commit9e442c17eeffca934c1de3674b910458e04c989b (patch)
treeeb5ee68d6e118f1b927a9f3fd6203e4fa673091a /src
parentab1f96e1d5ba6d6664eb472c2eaade4f91982734 (diff)
downloadrneovim-9e442c17eeffca934c1de3674b910458e04c989b.tar.gz
rneovim-9e442c17eeffca934c1de3674b910458e04c989b.tar.bz2
rneovim-9e442c17eeffca934c1de3674b910458e04c989b.zip
fix(input): allow Ctrl-C to interrupt a recursive mapping even if mapped (#18885)
Diffstat (limited to 'src')
-rw-r--r--src/nvim/getchar.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/nvim/getchar.c b/src/nvim/getchar.c
index 0aed5c8913..6b716c2e1f 100644
--- a/src/nvim/getchar.c
+++ b/src/nvim/getchar.c
@@ -2328,19 +2328,19 @@ static int vgetorpeek(bool advance)
// try re-mapping.
for (;;) {
check_end_reg_executing(advance);
- // os_breakcheck() can call input_enqueue()
- if ((mapped_ctrl_c | curbuf->b_mapped_ctrl_c) & get_real_state()) {
- ctrl_c_interrupts = false;
- }
// os_breakcheck() is slow, don't use it too often when
// inside a mapping. But call it each time for typed
// characters.
if (typebuf.tb_maplen) {
line_breakcheck();
} else {
+ // os_breakcheck() can call input_enqueue()
+ if ((mapped_ctrl_c | curbuf->b_mapped_ctrl_c) & get_real_state()) {
+ ctrl_c_interrupts = false;
+ }
os_breakcheck(); // check for CTRL-C
+ ctrl_c_interrupts = true;
}
- ctrl_c_interrupts = true;
int keylen = 0;
if (got_int) {
// flush all input