diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-04-15 13:28:42 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-04-15 13:28:42 +0200 |
| commit | 6c672194cd06fb1ab1289475aad31a9769bdb2ad (patch) | |
| tree | b09e33d920c34645b36f71b816f1ed0af4c28c83 | |
| parent | 3cba73423e5304ef7ccdb2280d65562d2f06f483 (diff) | |
| download | vim-6c672194cd06fb1ab1289475aad31a9769bdb2ad.zip | |
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.
| -rw-r--r-- | src/testdir/test_terminal.vim | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim index 6e101cfc9..5f330f7b1 100644 --- 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\<CR>") 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 index 207048f12..be4e4ed81 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 */ /**/ + 1718, +/**/ 1717, /**/ 1716, |