From 64802da6c4304a2700d9471d17c0aae143d9aab1 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Thu, 7 Apr 2022 14:27:47 +0800 Subject: fix(event-loop): check if executed register has ended --- src/nvim/getchar.c | 2 +- src/nvim/state.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/nvim/getchar.c b/src/nvim/getchar.c index 12c08baead..299385cb17 100644 --- a/src/nvim/getchar.c +++ b/src/nvim/getchar.c @@ -2074,7 +2074,7 @@ void vungetc(int c) /// When peeking and not getting a character, reg_executing cannot be cleared /// yet, so set a flag to clear it later. -static void check_end_reg_executing(bool advance) +void check_end_reg_executing(bool advance) { if (reg_executing != 0 && (typebuf.tb_maplen == 0 || pending_end_reg_executing)) { if (advance) { diff --git a/src/nvim/state.c b/src/nvim/state.c index 3a7636085b..34e3ddf654 100644 --- a/src/nvim/state.c +++ b/src/nvim/state.c @@ -40,7 +40,7 @@ void state_enter(VimState *s) int key; getkey: - // Expand mappings first by calling vpeekc() directly. + // Apply mappings first by calling vpeekc() directly. // - If vpeekc() returns non-NUL, there is a character already available for processing, so // don't block for events. vgetc() may still block, in case of an incomplete UTF-8 sequence. // - If vpeekc() returns NUL, vgetc() will block, and there are three cases: @@ -76,6 +76,9 @@ getkey: } if (key == K_EVENT) { + // An event handler may use the value of reg_executing. + // Clear it if it should be cleared when getting the next character. + check_end_reg_executing(true); may_sync_undo(); } -- cgit