aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 7.4.1739

Browse Source 
Problem:    Messages test fails on MS-Windows.
Solution:   Adjust the asserts.  Skip the "messages maintainer" line if not
            showing all messages.
This commit is contained in:
Bram Moolenaar 2016-04-14 19:44:36 +02:00
parent 5d91646599
commit bea1ede1c5
3 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/message.c
View File

@ -789,14 +789,7 @@ ex_messages(exarg_T *eap)
msg_hist_off = TRUE;
s = mch_getenv((char_u *)"LANG");
if (s != NULL && *s != NUL)
msg_attr((char_u *)
_("Messages maintainer: Bram Moolenaar <Bram@vim.org>"),
hl_attr(HLF_T));
p = first_msg_hist;
if (eap->addr_count != 0)
{
/* Count total messages */
@ -810,6 +803,15 @@ ex_messages(exarg_T *eap)
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 <Bram@vim.org>"),
hl_attr(HLF_T));
}
/* Display what was not skipped. */
for (; p != NULL && !got_int; p = p->next)
if (p->msg != NULL)

22
src/testdir/test_messages.vim
View File

@ -4,6 +4,8 @@ function Test_messages()
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,31 +13,27 @@ function Test_messages()
endfor
let result = ''
" get last two messages
redir => result
2messages | redraw
redir END
" get last two messages
let msg = split(result, "\n")[1:][-2:]
call assert_equal(["hello8", "hello9"], msg)
let msg_list = split(result, "\n")
call assert_equal(["hello8", "hello9"], msg_list)
" clear messages without last one
1messages clear
redir => result
redraw | 1messages
redraw | messages
redir END
" get last last message
let msg = split(result, "\n")[1:][-1:]
call assert_equal(['hello9'], msg)
let msg_list = split(result, "\n")
call assert_equal(['hello9'], msg_list)
" clear all messages
messages clear
redir => result
redraw | 1messages
redraw | messages
redir END
" get last last message
let msg = split(result, "\n")[1:][-1:]
call assert_equal([], msg)
call assert_equal('', result)
finally
let &more = oldmore
endtry

2
src/version.c
View File

@ -748,6 +748,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1739,
/**/
1738,
/**/