# HG changeset patch # User Christian Brabandt # Date 1523791806 -7200 # Node ID 2dd14253ad1269bf0e255d2edb6792a222b47c40 # Parent a0ee57b04deb37aa6a8685620c126d22d9b838d8 patch 8.0.1718: terminal scrollback test fails on MS-Windows commit https://github.com/vim/vim/commit/6c672194cd06fb1ab1289475aad31a9769bdb2ad Author: Bram Moolenaar Date: Sun Apr 15 13:28:42 2018 +0200 patch 8.0.1718: terminal scrollback test fails on MS-Windows Problem: Terminal scrollback test fails on MS-Windows. Solution: Check for the last line of output anticipating there might be an empty line below it. diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim --- a/src/testdir/test_terminal.vim +++ b/src/testdir/test_terminal.vim @@ -281,7 +281,8 @@ func Test_terminal_scrollback() call term_sendkeys(buf, "cat Xtext\") endif let rows = term_getsize(buf)[0] - call WaitFor({-> term_getline(buf, rows - 1) =~ '149'}) + " On MS-Windows there is an empty line, check both last line and above it. + call WaitFor({-> term_getline(buf, rows - 1) . term_getline(buf, rows - 2) =~ '149'}) let lines = line('$') call assert_inrange(91, 100, lines) diff --git a/src/version.c b/src/version.c --- 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 */ /**/ + 1718, +/**/ 1717, /**/ 1716,