summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/testdir/test_terminal.vim2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim
index 218b4ca6f..cd7a2b21e 100644
--- a/src/testdir/test_terminal.vim
+++ b/src/testdir/test_terminal.vim
@@ -1061,7 +1061,7 @@ func Api_drop_common(options)
\ "set t_ts=",
\ ], 'Xscript')
let buf = RunVimInTerminal('-S Xscript', {})
- call WaitFor({-> bufnr('Xtextfile') > 0})
+ call WaitFor({-> bufnr('Xtextfile') > 0}, 2000)
call assert_equal('Xtextfile', expand('%:t'))
call assert_true(winnr('$') >= 3)
return buf
diff --git a/src/version.c b/src/version.c
index 813bcfac2..59ca7a8fd 100644
--- a/src/version.c
+++ b/src/version.c
@@ -763,6 +763,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1670,
+/**/
1669,
/**/
1668,