To: vim_dev@googlegroups.com Subject: Patch 8.0.1718 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.0.1718 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. Files: src/testdir/test_terminal.vim *** ../vim-8.0.1717/src/testdir/test_terminal.vim 2018-04-15 13:10:27.041354182 +0200 --- src/testdir/test_terminal.vim 2018-04-15 13:26:35.178477804 +0200 *************** *** 281,287 **** call term_sendkeys(buf, "cat Xtext\") endif let rows = term_getsize(buf)[0] ! call WaitFor({-> term_getline(buf, rows - 1) =~ '149'}) let lines = line('$') call assert_inrange(91, 100, lines) --- 281,288 ---- call term_sendkeys(buf, "cat Xtext\") endif let rows = term_getsize(buf)[0] ! " 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) *** ../vim-8.0.1717/src/version.c 2018-04-15 13:12:41.928401027 +0200 --- src/version.c 2018-04-15 13:28:02.629854340 +0200 *************** *** 764,765 **** --- 764,767 ---- { /* Add new patch number below this line */ + /**/ + 1718, /**/ -- hundred-and-one symptoms of being an internet addict: 184. You no longer ask prospective dates what their sign is, instead your line is "Hi, what's your URL?" /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///