diff --git a/src/testdir/test_terminal2.vim b/src/testdir/test_terminal2.vim index 57944bedff..c6edea99a0 100644 --- a/src/testdir/test_terminal2.vim +++ b/src/testdir/test_terminal2.vim @@ -291,7 +291,7 @@ endfunc func Test_termwinscroll_topline2() let g:test_is_flaky = 1 - set termwinscroll=75000 mouse=a + set termwinscroll=50000 mouse=a if !has('win32') set shell=sh endif @@ -311,7 +311,7 @@ func Test_termwinscroll_topline2() endif let rows = term_getsize(buf)[0] " It may take a while to finish on a slow system - call term_wait(buf, 1000 * g:run_nr) + call term_wait(buf, 2000 * g:run_nr) " On MS-Windows there is an empty line, check both last line and above it. call WaitForAssert({-> assert_match(string(num1 - 1), term_getline(buf, rows - 1) .. '\|' .. term_getline(buf, rows - 2))}) call feedkeys("\N", 'xt') diff --git a/src/version.c b/src/version.c index 9519d6905d..21e2787d18 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 */ +/**/ + 1067, /**/ 1066, /**/