To: vim_dev@googlegroups.com Subject: Patch 7.4.1821 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 7.4.1821 (after 7.4.1820) Problem: Test fails on MS-Windows. Solution: Sort the completion results. Files: src/testdir/test_help_tagjump.vim *** ../vim-7.4.1820/src/testdir/test_help_tagjump.vim 2016-05-07 18:36:44.244210666 +0200 --- src/testdir/test_help_tagjump.vim 2016-05-07 22:27:33.360896412 +0200 *************** *** 102,137 **** 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) " '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) " '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', \ 'h test-col@ja', 'h test-char@en', ! \ 'h test-char@ab', 'h test-char@ja'], 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', \ 'h test-col@ja', 'h test-char', ! \ 'h test-char@en', 'h test-char@ja'], 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', \ 'h test-col@en', 'h test-char', ! \ 'h test-char@ja', 'h test-char@en'], list) endif catch call assert_exception('X') --- 102,137 ---- set rtp+=Xdir1/doc-ab set helplang= let list = s:get_cmd_compl_list(":h test") ! 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(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(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']), 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(sort(['h test-col', 'h test-col@en', \ 'h test-col@ja', 'h test-char', ! \ '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(sort(['h test-col', 'h test-col@ja', \ 'h test-col@en', 'h test-char', ! \ 'h test-char@ja', 'h test-char@en']), sort(list)) endif catch call assert_exception('X') *** ../vim-7.4.1820/src/version.c 2016-05-07 18:36:44.248210624 +0200 --- src/version.c 2016-05-07 22:28:24.240325394 +0200 *************** *** 755,756 **** --- 755,758 ---- { /* Add new patch number below this line */ + /**/ + 1821, /**/ -- FATAL ERROR! SYSTEM HALTED! - Press any key to continue doing nothing. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///