diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim index 6fc0dcc66..429e75095 100644 --- a/src/testdir/runtest.vim +++ b/src/testdir/runtest.vim @@ -244,10 +244,10 @@ func RunTheTest(test) echoconsole prefix .. 'Executing ' .. a:test if has('timers') - " No test should take longer than 30 seconds. If it takes longer we + " No test should take longer than 45 seconds. If it takes longer we " assume we are stuck and need to break out. let test_timeout_timer = - \ timer_start(RunningWithValgrind() ? 50000 : 30000, 'TestTimeout') + \ timer_start(RunningWithValgrind() ? 90000 : 45000, 'TestTimeout') let g:timeout_start = localtime() endif diff --git a/src/version.c b/src/version.c index 580f82a0b..040620222 100644 --- a/src/version.c +++ b/src/version.c @@ -704,6 +704,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1091, /**/ 1090, /**/