diff options
| -rw-r--r-- | src/getchar.c | 11 | ||||
| -rw-r--r-- | src/testdir/test_registers.vim | 14 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 27 insertions, 0 deletions
diff --git a/src/getchar.c b/src/getchar.c index 4e5c8b68cf..0e9942ba34 100644 --- a/src/getchar.c +++ b/src/getchar.c @@ -2913,6 +2913,17 @@ vgetorpeek(int advance) 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 1ed0a66d1e..b57555aed4 100644 --- a/src/testdir/test_registers.vim +++ b/src/testdir/test_registers.vim @@ -146,3 +146,17 @@ func Test_register_one() 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 1d0f90dd18..5b16760327 100644 --- a/src/version.c +++ b/src/version.c @@ -780,6 +780,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1003, +/**/ 1002, /**/ 1001, |