commit 4f026ea9f1ad9db262f0dba522768c84e5ae37b4
author zeertzjq <zeertzjq@outlook.com> Sun Feb 26 14:47:24 2023 +0000
committer Bram Moolenaar <Bram@vim.org> Sun Feb 26 14:47:24 2023 +0000
tree f2f9744ff7341c7dd0a7f69a032eb36956ab7273
parent 83ae6150bf6bd313487b3a51f9be9836e8b9c20f

patch 9.0.1356: cannot cancel "gr" with Esc

Problem:    Cannot cancel "gr" with Esc.
Solution:   Make "gr<Esc>" do nothing. (closes #12064)

src/normal.c

diff --git a/src/normal.c b/src/normal.c
index 95bb1a9..da01480 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -515,7 +515,8 @@
 	    cap->nchar = cap->extra_char;
 	    idx = find_command(cap->cmdchar);
 	}
-	else if ((cap->nchar == 'n' || cap->nchar == 'N') && cap->cmdchar == 'g')
+	else if ((cap->nchar == 'n' || cap->nchar == 'N')
+							&& cap->cmdchar == 'g')
 	    cap->oap->op_type = get_op_type(*cp, NUL);
 	else if (*cp == Ctrl_BSL)
 	{
@@ -5024,7 +5025,7 @@
 	return;
     }
 
-    if (checkclearopq(cap->oap))
+    if (checkclearopq(cap->oap) || cap->extra_char == ESC)
 	return;
 
     if (!curbuf->b_p_ma)