aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

patch 9.0.1385: g'Esc is considered an error

Browse Source 
Problem:    g'Esc is considered an error.
Solution:   Make g'Esc silently abandon the command. (closes #12110)
This commit is contained in:
zeertzjq
2023-03-05 21:15:06 +00:00
committed by Bram Moolenaar
parent b0b6b8b07e
commit f86dea8119
3 changed files with 43 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/normal.c
View File

@@ -899,7 +899,7 @@ normal_cmd(
State = MODE_NORMAL;
if (ca.nchar == ESC)
if (ca.nchar == ESC || ca.extra_char == ESC)
{
clearop(oap);
if (restart_edit == 0 && goto_im())
@@ -984,7 +984,8 @@ normal_end:
#ifdef CURSOR_SHAPE
// Redraw the cursor with another shape, if we were in Operator-pending
// mode or did a replace command.
if (prev_finish_op || ca.cmdchar == 'r')
if (prev_finish_op || ca.cmdchar == 'r'
|| (ca.cmdchar == 'g' && ca.nchar == 'r'))
{
ui_cursor_shape(); // may show different cursor shape
# ifdef FEAT_MOUSESHAPE
@@ -5025,7 +5026,7 @@ nv_vreplace(cmdarg_T *cap)
return;
}
if (checkclearopq(cap->oap) || cap->extra_char == ESC)
if (checkclearopq(cap->oap))
return;
if (!curbuf->b_p_ma)
@@ -5903,7 +5904,7 @@ nv_g_cmd(cmdarg_T *cap)
else
#endif
// "g^A/g^X": sequentially increment visually selected region
if (VIsual_active)
if (VIsual_active)
{
cap->arg = TRUE;
cap->cmdchar = cap->nchar;