vim-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

bea1ede1c5
This commit is contained in:
Michael Ennen
2016-11-29 16:37:47 -07:00
committed by James McCoy
parent f94740097b
commit 909b7d9dea
2 changed files with 11 additions and 13 deletions

View File

@@ -4,6 +4,8 @@ function Test_messages()
let oldmore = &more let oldmore = &more
try try
set nomore set nomore
" Avoid the "message maintainer" line.
let $LANG = ''
let arr = map(range(10), '"hello" . v:val') let arr = map(range(10), '"hello" . v:val')
for s in arr for s in arr
@@ -11,31 +13,27 @@ function Test_messages()
endfor endfor
let result = '' let result = ''
" get last two messages
redir => result redir => result
2messages | redraw 2messages | redraw
redir END redir END
let msg_list = split(result, "\n")
" get last two messages call assert_equal(["hello8", "hello9"], msg_list)
let msg = split(result, "\n")[1:][-2:]
call assert_equal(["hello8", "hello9"], msg)
" clear messages without last one " clear messages without last one
1messages clear 1messages clear
redir => result redir => result
redraw | 1messages redraw | messages
redir END redir END
" get last last message let msg_list = split(result, "\n")
let msg = split(result, "\n")[1:][-1:] call assert_equal(['hello9'], msg_list)
call assert_equal(['hello9'], msg)
" clear all messages " clear all messages
messages clear messages clear
redir => result redir => result
redraw | 1messages redraw | messages
redir END redir END
" get last last message call assert_equal('', result)
let msg = split(result, "\n")[1:][-1:]
call assert_equal([], msg)
finally finally
let &more = oldmore let &more = oldmore
endtry endtry

View File

@@ -705,7 +705,7 @@ static int included_patches[] = {
1742, 1742,
1741, 1741,
1740, 1740,
// 1739, 1739,
1738, 1738,
// 1737 NA // 1737 NA
// 1736 NA // 1736 NA