diff options
| author | Michael Ennen <mike.ennen@gmail.com> | 2016-11-29 16:37:47 -0700 |
|---|---|---|
| committer | James McCoy <jamessan@jamessan.com> | 2016-12-01 09:15:47 -0500 |
| commit | 909b7d9dea6127632905da3758de3c93fa58896c (patch) | |
| tree | fa3fbb342b1e17b25957d9ba5552c3713b427e35 | |
| parent | f94740097bc8309946c145f496592f4da6e4ce54 (diff) | |
| download | rneovim-909b7d9dea6127632905da3758de3c93fa58896c.tar.gz rneovim-909b7d9dea6127632905da3758de3c93fa58896c.tar.bz2 rneovim-909b7d9dea6127632905da3758de3c93fa58896c.zip | |
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
https://github.com/vim/vim/commit/bea1ede1c59a11ca5bf9d91cd30b7b2937b9fb41
| -rw-r--r-- | src/nvim/testdir/test_messages.vim | 22 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 11 insertions, 13 deletions
diff --git a/src/nvim/testdir/test_messages.vim b/src/nvim/testdir/test_messages.vim index 4d7e41130c..188406e440 100644 --- a/src/nvim/testdir/test_messages.vim +++ b/src/nvim/testdir/test_messages.vim @@ -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 diff --git a/src/nvim/version.c b/src/nvim/version.c index db4ca60ceb..0097f78e89 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -705,7 +705,7 @@ static int included_patches[] = { 1742, 1741, 1740, - // 1739, + 1739, 1738, // 1737 NA // 1736 NA |