To: vim_dev@googlegroups.com Subject: Patch 8.2.0639 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.0639 Problem: MS-Windows: messages test still fails. Solution: Filter out the maintainer message. Files: src/testdir/test_messages.vim *** ../vim-8.2.0638/src/testdir/test_messages.vim 2020-04-25 16:41:54.699591413 +0200 --- src/testdir/test_messages.vim 2020-04-25 17:10:31.301120557 +0200 *************** *** 3,23 **** source shared.vim source term_util.vim ! function Test_messages() let oldmore = &more try set nomore - " Avoid the "message maintainer" line. - let $LANG = '' - let $LC_ALL = '' - let $LC_MESSAGES = '' - let $LC_COLLATE = '' let arr = map(range(10), '"hello" . v:val') for s in arr echomsg s | redraw endfor - let result = '' " get last two messages redir => result --- 3,29 ---- source shared.vim source term_util.vim ! " Get all messages but drop the maintainer entry. ! func GetMessages() ! redir => result ! redraw | messages ! redir END ! let msg_list = split(result, "\n") ! if msg_list->len() > 0 && msg_list[0] =~ 'Messages maintainer:' ! return msg_list[1:] ! endif ! return msg_list ! endfunc ! ! func Test_messages() let oldmore = &more try set nomore let arr = map(range(10), '"hello" . v:val') for s in arr echomsg s | redraw endfor " get last two messages redir => result *************** *** 28,51 **** " clear messages without last one 1messages clear ! redir => result ! redraw | messages ! redir END ! let msg_list = split(result, "\n") call assert_equal(['hello9'], msg_list) " clear all messages messages clear ! redir => result ! redraw | messages ! redir END ! call assert_equal('', result) finally let &more = oldmore endtry call assert_fails('message 1', 'E474:') ! endfunction " Patch 7.4.1696 defined the "clearmode()" function for clearing the mode " indicator (e.g., "-- INSERT --") when ":stopinsert" is invoked. Message --- 34,52 ---- " clear messages without last one 1messages clear ! let msg_list = GetMessages() call assert_equal(['hello9'], msg_list) " clear all messages messages clear ! let msg_list = GetMessages() ! call assert_equal([], msg_list) finally let &more = oldmore endtry call assert_fails('message 1', 'E474:') ! endfunc " Patch 7.4.1696 defined the "clearmode()" function for clearing the mode " indicator (e.g., "-- INSERT --") when ":stopinsert" is invoked. Message *** ../vim-8.2.0638/src/version.c 2020-04-25 16:41:54.699591413 +0200 --- src/version.c 2020-04-25 17:13:40.740754249 +0200 *************** *** 748,749 **** --- 748,751 ---- { /* Add new patch number below this line */ + /**/ + 639, /**/ -- hundred-and-one symptoms of being an internet addict: 17. You turn on your intercom when leaving the room so you can hear if new e-mail arrives. /// 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 ///