To: vim_dev@googlegroups.com Subject: Patch 8.2.3802 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.3802 Problem: Terminal in two windows test fails on some systems. Solution: Wait a bit between commands. Files: src/testdir/test_terminal.vim *** ../vim-8.2.3801/src/testdir/test_terminal.vim 2021-12-13 21:59:04.895993159 +0000 --- src/testdir/test_terminal.vim 2021-12-13 22:16:24.335022800 +0000 *************** *** 1378,1384 **** endfunc func Test_terminal_popup_two_windows() ! CheckScreendump CheckUnix " use "sh" instead of "&shell" in the hope it will use a short prompt --- 1378,1384 ---- endfunc func Test_terminal_popup_two_windows() ! CheckRunVimInTerminal CheckUnix " use "sh" instead of "&shell" in the hope it will use a short prompt *************** *** 1398,1404 **** call WaitForAssert({-> assert_match("echo 'test'", term_getline(buf, 1))}) call WaitForAssert({-> assert_match("echo 'test'", term_getline(buf, 3))}) ! call term_sendkeys(buf, "\exit\:q\") call StopVimInTerminal(buf) call delete('XpopupScript') endfunc --- 1398,1406 ---- call WaitForAssert({-> assert_match("echo 'test'", term_getline(buf, 1))}) call WaitForAssert({-> assert_match("echo 'test'", term_getline(buf, 3))}) ! call term_sendkeys(buf, "\\exit\") ! call TermWait(buf) ! call term_sendkeys(buf, ":q\") call StopVimInTerminal(buf) call delete('XpopupScript') endfunc *** ../vim-8.2.3801/src/version.c 2021-12-13 21:59:04.895993159 +0000 --- src/version.c 2021-12-13 22:17:10.314979450 +0000 *************** *** 751,752 **** --- 751,754 ---- { /* Add new patch number below this line */ + /**/ + 3802, /**/ -- The only backup you need is the one that you didn't have time for. (Murphy) /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// \\\ \\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///