summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/testdir/test_autocmd.vim1
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/src/testdir/test_autocmd.vim b/src/testdir/test_autocmd.vim
index cf3d6fca13..12fbcb7ad7 100644
--- a/src/testdir/test_autocmd.vim
+++ b/src/testdir/test_autocmd.vim
@@ -640,6 +640,7 @@ func Test_WinScrolled_diff()
\ }, event)
call StopVimInTerminal(buf)
+ call delete('XscrollEvent')
endfunc
func Test_WinClosed()
diff --git a/src/version.c b/src/version.c
index ae5de35192..d3eb35a025 100644
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1214,
+/**/
1213,
/**/
1212,