adam/vim
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

patch 7.4.1821

Browse Source 
Problem:    Test fails on MS-Windows.
Solution:   Sort the completion results.
This commit is contained in:
Bram Moolenaar
2016-05-07 22:28:53 +02:00
parent 9ccaae04c6
commit 4ed6b2e2d7
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/testdir/test_help_tagjump.vim
View File

@ -102,36 +102,36 @@ func Test_help_complete()
set rtp+=Xdir1/doc-ab set rtp+=Xdir1/doc-ab
set helplang= set helplang=
let list = s:get_cmd_compl_list(":h test") 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-char@en', 'h test-char@ab'], list) \ 'h test-char@en', 'h test-char@ab']), sort(list))
" 'helplang=ab' and help file lang is 'en' and 'ab' " 'helplang=ab' and help file lang is 'en' and 'ab'
set helplang=ab set helplang=ab
let list = s:get_cmd_compl_list(":h test") 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-char', 'h test-char@en'], list) \ 'h test-char', 'h test-char@en']), sort(list))
" 'helplang=' and help file lang is 'en', 'ab' and 'ja' " 'helplang=' and help file lang is 'en', 'ab' and 'ja'
set rtp+=Xdir1/doc-ja set rtp+=Xdir1/doc-ja
set helplang= set helplang=
let list = s:get_cmd_compl_list(":h test") 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-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' " 'helplang=ab' and help file lang is 'en', 'ab' and 'ja'
set helplang=ab set helplang=ab
let list = s:get_cmd_compl_list(":h test") 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-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' " 'helplang=ab,ja' and help file lang is 'en', 'ab' and 'ja'
set helplang=ab,ja set helplang=ab,ja
let list = s:get_cmd_compl_list(":h test") 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-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 endif
catch catch
call assert_exception('X') call assert_exception('X')

2
src/version.c
View File

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