summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/testdir/test_autocmd.vim4
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/testdir/test_autocmd.vim b/src/testdir/test_autocmd.vim
index 1f901a9ff..f2c9af50f 100644
--- a/src/testdir/test_autocmd.vim
+++ b/src/testdir/test_autocmd.vim
@@ -2250,7 +2250,9 @@ func Test_autocmd_SafeState()
call WaitForAssert({-> assert_match('^xxxx', term_getline(buf, 6))}, 1000)
call term_sendkeys(buf, ":let g:again = ''\<CR>:call CallTimer()\<CR>")
- call term_wait(buf, 50)
+ call term_wait(buf)
+ call term_sendkeys(buf, ":\<CR>")
+ call term_wait(buf)
call term_sendkeys(buf, ":echo g:again\<CR>")
call WaitForAssert({-> assert_match('xtx', term_getline(buf, 6))}, 1000)
diff --git a/src/version.c b/src/version.c
index 678bc13d4..bfe483e28 100644
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2069,
+/**/
2068,
/**/
2067,