diff --git a/src/testdir/screendump.vim b/src/testdir/screendump.vim index d4fae07425..764345a98c 100644 --- a/src/testdir/screendump.vim +++ b/src/testdir/screendump.vim @@ -59,8 +59,9 @@ func RunVimInTerminal(arguments, options) let buf = term_start(cmd, {'curwin': 1, 'term_rows': rows, 'term_cols': cols}) call assert_equal([rows, cols], term_getsize(buf)) - " Wait for the ruler (in the status line) to be shown. - call WaitFor({-> len(term_getline(buf, rows)) >= cols - 1}) + " Wait for "All" of the ruler in the status line to be shown. + " This can be quite slow (e.g. when using valgrind), wait up to 4 seconds. + call WaitFor({-> len(term_getline(buf, rows)) >= cols - 1}, 4000) return buf endfunc diff --git a/src/version.c b/src/version.c index 44fb030fc9..c625b05c16 100644 --- a/src/version.c +++ b/src/version.c @@ -762,6 +762,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1667, /**/ 1666, /**/