diff options
| author | Jurica Bradaric <jbradaric@gmail.com> | 2016-09-25 22:51:43 +0200 |
|---|---|---|
| committer | Jurica Bradaric <jbradaric@gmail.com> | 2016-09-25 22:55:13 +0200 |
| commit | b6f8c35cf7d88b0fb23e12f51f1d032f030ec845 (patch) | |
| tree | 063afde5a5fbf411b31bd1c0e62e1ff41c8351ba | |
| parent | 9114790c4ce73d7f2eae0a1a06a7ced02ab86cf0 (diff) | |
| download | rneovim-b6f8c35cf7d88b0fb23e12f51f1d032f030ec845.tar.gz rneovim-b6f8c35cf7d88b0fb23e12f51f1d032f030ec845.tar.bz2 rneovim-b6f8c35cf7d88b0fb23e12f51f1d032f030ec845.zip | |
vim-patch:7.4.1821
Problem: Test fails on MS-Windows.
Solution: Sort the completion results.
https://github.com/vim/vim/commit/4ed6b2e2d7fd5959fb9b9f608935d47305c4bbe4
| -rw-r--r-- | src/nvim/testdir/test_help_tagjump.vim | 20 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 11 insertions, 11 deletions
diff --git a/src/nvim/testdir/test_help_tagjump.vim b/src/nvim/testdir/test_help_tagjump.vim index 4e09e1f56b..cc1c81c7f6 100644 --- a/src/nvim/testdir/test_help_tagjump.vim +++ b/src/nvim/testdir/test_help_tagjump.vim @@ -124,36 +124,36 @@ func Test_help_complete() set rtp+=Xdir1/doc-ab set helplang= let list = s:get_cmd_compl_list(":h test") - call assert_equal(['h test-col@en', 'h test-col@ab', - \ 'h test-char@en', 'h test-char@ab'], list) + call assert_equal(sort(['h test-col@en', 'h test-col@ab', + \ 'h test-char@en', 'h test-char@ab']), sort(list)) " 'helplang=ab' and help file lang is 'en' and 'ab' set helplang=ab let list = s:get_cmd_compl_list(":h test") - call assert_equal(['h test-col', 'h test-col@en', - \ 'h test-char', 'h test-char@en'], list) + call assert_equal(sort(['h test-col', 'h test-col@en', + \ 'h test-char', 'h test-char@en']), sort(list)) " 'helplang=' and help file lang is 'en', 'ab' and 'ja' set rtp+=Xdir1/doc-ja set helplang= let list = s:get_cmd_compl_list(":h test") - call assert_equal(['h test-col@en', 'h test-col@ab', + call assert_equal(sort(['h test-col@en', 'h test-col@ab', \ 'h test-col@ja', 'h test-char@en', - \ 'h test-char@ab', 'h test-char@ja'], list) + \ 'h test-char@ab', 'h test-char@ja']), sort(list)) " 'helplang=ab' and help file lang is 'en', 'ab' and 'ja' set helplang=ab let list = s:get_cmd_compl_list(":h test") - call assert_equal(['h test-col', 'h test-col@en', + call assert_equal(sort(['h test-col', 'h test-col@en', \ 'h test-col@ja', 'h test-char', - \ 'h test-char@en', 'h test-char@ja'], list) + \ 'h test-char@en', 'h test-char@ja']), sort(list)) " 'helplang=ab,ja' and help file lang is 'en', 'ab' and 'ja' set helplang=ab,ja let list = s:get_cmd_compl_list(":h test") - call assert_equal(['h test-col', 'h test-col@ja', + call assert_equal(sort(['h test-col', 'h test-col@ja', \ 'h test-col@en', 'h test-char', - \ 'h test-char@ja', 'h test-char@en'], list) + \ 'h test-char@ja', 'h test-char@en']), sort(list)) endif catch call assert_exception('X') diff --git a/src/nvim/version.c b/src/nvim/version.c index 41e295f65e..657afdd5e0 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -620,7 +620,7 @@ static int included_patches[] = { // 1824 NA // 1823, // 1822 NA - // 1821, + 1821, 1820, // 1819 NA 1818, |