IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.0.0234: cannot make difference between :normal end and argument char (#19879)

Browse Source 
Problem:    Cannot make difference between the end of :normal and a character
            in its argument.
Solution:   Add the "typebuf_was_empty" flag. (closes vim/vim#10950)
8d69637133
This commit is contained in:
zeertzjq 2022-08-21 19:37:11 +08:00 committed by GitHub
parent 6b9852cc41
commit 5928d5c2f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/nvim/getchar.c
View File

@ -2400,7 +2400,8 @@ static int vgetorpeek(bool advance)
vgetc_busy++;
if (advance) {
KeyStuffed = FALSE;
KeyStuffed = false;
typebuf_was_empty = false;
}
init_typebuf();
@ -2626,6 +2627,11 @@ static int vgetorpeek(bool advance)
}
tc = c;
// set a flag to indicate this wasn't a normal char
if (advance) {
typebuf_was_empty = true;
}
// return 0 in normal_check()
if (pending_exmode_active) {
exmode_active = true;

4
src/nvim/globals.h
View File

@ -705,6 +705,10 @@ EXTERN int recoverymode INIT(= false); // Set to true for "-r" option
// typeahead buffer
EXTERN typebuf_T typebuf INIT(= { NULL, NULL, 0, 0, 0, 0, 0, 0, 0 });
/// Flag used to indicate that vgetorpeek() returned a char like Esc when the
/// :normal argument was exhausted.
EXTERN bool typebuf_was_empty INIT(= false);
EXTERN int ex_normal_busy INIT(= 0); // recursiveness of ex_normal()
EXTERN int ex_normal_lock INIT(= 0); // forbid use of ex_normal()
EXTERN int ignore_script INIT(= false); // ignore script input

6
src/nvim/normal.c
View File

@ -6943,10 +6943,10 @@ static void nv_esc(cmdarg_T *cap)
got_int = false; // don't stop executing autocommands et al.
return;
}
} else if (cmdwin_type != 0 && ex_normal_busy) {
} else if (cmdwin_type != 0 && ex_normal_busy && typebuf_was_empty) {
// When :normal runs out of characters while in the command line window
// vgetorpeek() will return ESC. Exit the cmdline window to break the
// loop.
// vgetorpeek() will repeatedly return ESC. Exit the cmdline window to
// break the loop.
cmdwin_result = K_IGNORE;
return;
}