patch 8.1.1003: playing back recorded key sequence mistakes key code
Problem: Playing back recorded key sequence mistakes key code.
Solution: Insert a <Nop> after the <Esc>. (closes #4068)
diff --git a/src/getchar.c b/src/getchar.c
index 4e5c8b6..0e9942b 100644
--- a/src/getchar.c
+++ b/src/getchar.c
@@ -2913,6 +2913,17 @@
if (gui.in_use && shape_changed)
gui_update_cursor(TRUE, FALSE);
#endif
+ if (timedout && c == ESC)
+ {
+ char_u nop_buf[3];
+
+ // When recording there will be no timeout. Add a <Nop> after the ESC
+ // to avoid that it forms a key code with following characters.
+ nop_buf[0] = K_SPECIAL;
+ nop_buf[1] = KS_EXTRA;
+ nop_buf[2] = KE_NOP;
+ gotchars(nop_buf, 3);
+ }
--vgetc_busy;
diff --git a/src/testdir/test_registers.vim b/src/testdir/test_registers.vim
index 1ed0a66..b57555a 100644
--- a/src/testdir/test_registers.vim
+++ b/src/testdir/test_registers.vim
@@ -146,3 +146,17 @@
bwipe!
endfunc
+
+" Check that replaying a typed sequence does not use an Esc and following
+" characters as an escape sequence.
+func Test_recording_esc_sequence()
+ new
+ let save_F2 = &t_F2
+ let t_F2 = "\<Esc>OQ"
+ call feedkeys("qqiTest\<Esc>", "xt")
+ call feedkeys("OQuirk\<Esc>q", "xt")
+ call feedkeys("Go\<Esc>@q", "xt")
+ call assert_equal(['Quirk', 'Test', 'Quirk', 'Test'], getline(1, 4))
+ bwipe!
+ let t_F2 = save_F2
+endfunc
diff --git a/src/version.c b/src/version.c
index 1d0f90d..5b16760 100644
--- a/src/version.c
+++ b/src/version.c
@@ -780,6 +780,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1003,
+/**/
1002,
/**/
1001,