To: vim_dev@googlegroups.com Subject: Patch 7.4.1739 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 7.4.1739 Problem: Messages test fails on MS-Windows. Solution: Adjust the asserts. Skip the "messages maintainer" line if not showing all messages. Files: src/message.c, src/testdir/test_messages.vim *** ../vim-7.4.1738/src/message.c 2016-04-14 17:52:37.481264034 +0200 --- src/message.c 2016-04-14 19:14:44.714587117 +0200 *************** *** 789,802 **** msg_hist_off = TRUE; - s = mch_getenv((char_u *)"LANG"); - if (s != NULL && *s != NUL) - msg_attr((char_u *) - _("Messages maintainer: Bram Moolenaar "), - hl_attr(HLF_T)); - p = first_msg_hist; - if (eap->addr_count != 0) { /* Count total messages */ --- 789,795 ---- *************** *** 810,815 **** --- 803,817 ---- p = p->next, c--); } + if (p == first_msg_hist) + { + s = mch_getenv((char_u *)"LANG"); + if (s != NULL && *s != NUL) + msg_attr((char_u *) + _("Messages maintainer: Bram Moolenaar "), + hl_attr(HLF_T)); + } + /* Display what was not skipped. */ for (; p != NULL && !got_int; p = p->next) if (p->msg != NULL) *** ../vim-7.4.1738/src/testdir/test_messages.vim 2016-04-14 17:15:47.223835356 +0200 --- src/testdir/test_messages.vim 2016-04-14 19:39:26.631417944 +0200 *************** *** 4,9 **** --- 4,11 ---- let oldmore = &more try set nomore + " Avoid the "message maintainer" line. + let $LANG = '' let arr = map(range(10), '"hello" . v:val') for s in arr *************** *** 11,41 **** endfor let result = '' redir => result 2messages | redraw redir END ! ! " get last two messages ! let msg = split(result, "\n")[1:][-2:] ! call assert_equal(["hello8", "hello9"], msg) " clear messages without last one 1messages clear redir => result ! redraw | 1messages redir END ! " get last last message ! let msg = split(result, "\n")[1:][-1:] ! call assert_equal(['hello9'], msg) " clear all messages messages clear redir => result ! redraw | 1messages redir END ! " get last last message ! let msg = split(result, "\n")[1:][-1:] ! call assert_equal([], msg) finally let &more = oldmore endtry --- 13,39 ---- endfor let result = '' + " get last two messages redir => result 2messages | redraw redir END ! let msg_list = split(result, "\n") ! call assert_equal(["hello8", "hello9"], msg_list) " 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 *** ../vim-7.4.1738/src/version.c 2016-04-14 18:42:37.330439451 +0200 --- src/version.c 2016-04-14 18:43:40.421789453 +0200 *************** *** 750,751 **** --- 750,753 ---- { /* Add new patch number below this line */ + /**/ + 1739, /**/ -- They now pass three KNIGHTS impaled to a tree. With their feet off the ground, with one lance through the lot of them, they are skewered up like a barbecue. "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// 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 ///