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

vim-patch:9.0.1385: g'Esc is considered an error (#22544)

Browse Source 
Problem:    g'Esc is considered an error.
Solution:   Make g'Esc silently abandon the command. (closes vim/vim#12110)

f86dea8119
This commit is contained in:
zeertzjq
2023-03-06 07:52:11 +08:00
committed by GitHub
parent 533d671271
commit e389b18902
3 changed files with 62 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/nvim/normal.c
View File

@@ -963,7 +963,8 @@ normal_end:
may_trigger_modechanged();
// Redraw the cursor with another shape, if we were in Operator-pending
// mode or did a replace command.
if (s->c || s->ca.cmdchar == 'r') {
if (s->c || s->ca.cmdchar == 'r'
|| (s->ca.cmdchar == 'g' && s->ca.nchar == 'r')) {
ui_cursor_shape(); // may show different cursor shape
}
@@ -1162,7 +1163,7 @@ static int normal_execute(VimState *state, int key)
State = MODE_NORMAL;
if (s->ca.nchar == ESC) {
if (s->ca.nchar == ESC || s->ca.extra_char == ESC) {
clearop(&s->oa);
s->command_finished = true;
goto finish;
@@ -4706,7 +4707,7 @@ static void nv_vreplace(cmdarg_T *cap)
return;
}
if (checkclearopq(cap->oap) || cap->extra_char == ESC) {
if (checkclearopq(cap->oap)) {
return;
}