summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2022-07-01 16:35:45 +0100
committerBram Moolenaar <Bram@vim.org>2022-07-01 16:35:45 +0100
commit27efc62f5d86afcb2ecb7565587fe8dea4b036fe (patch)
tree89ff146617fe7968c41c2cdf552502fa2f462cc4
parent3d51ce18ab1be4f9f6061568a4e7fabf00b21794 (diff)
patch 9.0.0018: going over the end of the typaheadv9.0.0018
Problem: Going over the end of the typahead. Solution: Put a NUL after the typeahead.
-rw-r--r--src/term.c1
-rw-r--r--src/testdir/test_mapping.vim10
-rw-r--r--src/version.c2
3 files changed, 13 insertions, 0 deletions
diff --git a/src/term.c b/src/term.c
index 754ef822d8..7d7b84b9a7 100644
--- a/src/term.c
+++ b/src/term.c
@@ -5393,6 +5393,7 @@ check_termcode(
if (*tp == ESC && !p_ek && (State & MODE_INSERT))
continue;
+ tp[len] = NUL;
key_name[0] = NUL; // no key name found yet
key_name[1] = NUL; // no key name found yet
modifiers = 0; // no modifiers yet
diff --git a/src/testdir/test_mapping.vim b/src/testdir/test_mapping.vim
index ace6453f49..2927ba718b 100644
--- a/src/testdir/test_mapping.vim
+++ b/src/testdir/test_mapping.vim
@@ -1715,4 +1715,14 @@ func Test_map_after_timed_out_nop()
call delete('Xtest_map_after_timed_out_nop')
endfunc
+func Test_using_past_typeahead()
+ nnoremap :00 0
+ exe "norm :set \x80\xfb0=0\<CR>"
+ exe "sil norm :0\x0f\<C-U>\<CR>"
+
+ exe "norm :set \x80\xfb0=\<CR>"
+ nunmap :00
+endfunc
+
+
" vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/version.c b/src/version.c
index 5d10909135..6415b59caf 100644
--- a/src/version.c
+++ b/src/version.c
@@ -736,6 +736,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 18,
+/**/
17,
/**/
16,