To: vim_dev@googlegroups.com Subject: Patch 8.1.2405 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.1.2405 Problem: matchadd_conceal test fails under valgrind. Solution: Use WaitForAssert() and wait a bit longer. Files: src/testdir/test_matchadd_conceal.vim *** ../vim-8.1.2404/src/testdir/test_matchadd_conceal.vim 2019-11-16 14:19:29.711739240 +0100 --- src/testdir/test_matchadd_conceal.vim 2019-12-07 17:21:22.210831778 +0100 *************** *** 298,309 **** END call writefile(lines, 'Xcolesearch') let buf = RunVimInTerminal('Xcolesearch', {}) " Jump to something that is beyond the bottom of the window, " so there's a scroll down. call term_sendkeys(buf, ":so %\") call term_sendkeys(buf, "/expr\") ! call term_wait(buf) " Are the concealed parts of the current line really hidden? let cursor_row = term_scrape(buf, '.')->map({_, e -> e.chars})->join('') --- 298,311 ---- END call writefile(lines, 'Xcolesearch') let buf = RunVimInTerminal('Xcolesearch', {}) + call term_wait(buf, 100) " Jump to something that is beyond the bottom of the window, " so there's a scroll down. call term_sendkeys(buf, ":so %\") + call term_wait(buf, 100) call term_sendkeys(buf, "/expr\") ! call term_wait(buf, 100) " Are the concealed parts of the current line really hidden? let cursor_row = term_scrape(buf, '.')->map({_, e -> e.chars})->join('') *************** *** 336,342 **** call term_wait(buf) " Are the concealed parts of the current line really hidden? ! call assert_equal('c', term_getline(buf, '.')) " BugFix check: Is the window's cursor column properly updated for conceal? call assert_equal(1, term_getcursor(buf)[1]) --- 338,344 ---- call term_wait(buf) " Are the concealed parts of the current line really hidden? ! call WaitForAssert({-> assert_equal('c', term_getline(buf, '.'))}) " BugFix check: Is the window's cursor column properly updated for conceal? call assert_equal(1, term_getcursor(buf)[1]) *** ../vim-8.1.2404/src/version.c 2019-12-07 17:10:21.989962024 +0100 --- src/version.c 2019-12-07 17:21:45.854726270 +0100 *************** *** 744,745 **** --- 744,747 ---- { /* Add new patch number below this line */ + /**/ + 2405, /**/ -- From the classified section of a city newspaper: Dog for sale: eats anything and is fond of children. /// 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 ///