mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-26 21:18:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(input): fix clearing of reg_executing

Browse Source 
vim-patch:8.2.4705
This commit is contained in:
zeertzjq
2022-04-07 21:13:09 +08:00
parent dc9e436986
commit 2a574f7aaa
6 changed files with 72 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/nvim/getchar.c
View File

@@ -2060,7 +2060,7 @@ static int handle_mapping(int *keylenp, bool *timedout, int *mapdepth)
}
/// unget one character (can only be done once!)
/// If the character was stuffed, vgetc() will get it next time it was called.
/// If the character was stuffed, vgetc() will get it next time it is called.
/// Otherwise vgetc() will only get it when the stuff buffer is empty.
void vungetc(int c)
{
@@ -2072,6 +2072,20 @@ void vungetc(int c)
old_KeyStuffed = KeyStuffed;
}
/// 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)
{
if (reg_executing != 0 && (typebuf.tb_maplen == 0 || pending_end_reg_executing)) {
if (advance) {
reg_executing = 0;
pending_end_reg_executing = false;
} else {
pending_end_reg_executing = true;
}
}
}
/// Gets a byte:
/// 1. from the stuffbuffer
/// This is used for abbreviated commands like "D" -> "d$".
@@ -2126,9 +2140,7 @@ static int vgetorpeek(bool advance)
init_typebuf();
start_stuff();
if (advance && typebuf.tb_maplen == 0) {
reg_executing = 0;
}
check_end_reg_executing(advance);
do {
// get a character: 1. from the stuffbuffer
if (typeahead_char != 0) {
@@ -2155,6 +2167,7 @@ static int vgetorpeek(bool advance)
// If a mapped key sequence is found we go back to the start to
// try re-mapping.
for (;;) {
check_end_reg_executing(advance);
// os_breakcheck() is slow, don't use it too often when
// inside a mapping. But call it each time for typed
// characters.