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
index 6e101cfc9bd736e10316024fc64681ea88f10d93..5f330f7b19596f54cdfc2111b1bd35c5dfe63465 100644 (file)
--- 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 207048f129b63c37abfb56cde80dad939293fcaf..be4e4ed81b3af85a78bebb759fa067530af31469 100644 (file)
--- 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 */
+/**/
+    1718,
 /**/
     1717,
 /**/