summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/testdir/screendump.vim2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/testdir/screendump.vim b/src/testdir/screendump.vim
index 764345a98c..e1e660b373 100644
--- a/src/testdir/screendump.vim
+++ b/src/testdir/screendump.vim
@@ -70,7 +70,7 @@ endfunc
func StopVimInTerminal(buf)
call assert_equal("running", term_getstatus(a:buf))
call term_sendkeys(a:buf, "\<Esc>\<Esc>:qa!\<cr>")
- call WaitFor('term_getstatus(' . a:buf . ') == "finished"')
+ call WaitFor('term_getstatus(' . a:buf . ') == "finished"', 3000)
only!
endfunc
diff --git a/src/version.c b/src/version.c
index 80b05fa0f0..46d12cc8cf 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 */
/**/
+ 1694,
+/**/
1693,
/**/
1692,