To: vim_dev@googlegroups.com Subject: Patch 7.4.2085 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 7.4.2085 Problem: Digraph tests fails on some systems. Solution: Run it separately and set 'encoding' early. Files: src/testdir/Make_all.mak, src/testdir/test_alot.vim, src/testdir/test_digraph.vim *** ../vim-7.4.2084/src/testdir/Make_all.mak 2016-07-15 17:08:45.658711110 +0200 --- src/testdir/Make_all.mak 2016-07-21 10:05:12.570433165 +0200 *************** *** 170,175 **** --- 170,176 ---- test_channel.res \ test_cmdline.res \ test_cscope.res \ + test_digraph.res \ test_farsi.res \ test_hardcopy.res \ test_history.res \ *** ../vim-7.4.2084/src/testdir/test_alot.vim 2016-07-20 22:00:55.859928795 +0200 --- src/testdir/test_alot.vim 2016-07-21 10:05:06.482494463 +0200 *************** *** 5,11 **** source test_autocmd.vim source test_cursor_func.vim source test_delete.vim - source test_digraph.vim source test_execute_func.vim source test_ex_undo.vim source test_expand.vim --- 5,10 ---- *** ../vim-7.4.2084/src/testdir/test_digraph.vim 2016-07-20 22:23:45.417515463 +0200 --- src/testdir/test_digraph.vim 2016-07-21 10:08:26.912476380 +0200 *************** *** 4,9 **** --- 4,10 ---- finish endif + set enc=utf-8 scriptencoding utf-8 func! Put_Dig(chars) *************** *** 15,22 **** endfu func! Test_digraphs() - let _enc = &enc - set enc=utf8 new call Put_Dig("00") call assert_equal("∞", getline('.')) --- 16,21 ---- *************** *** 215,230 **** call Put_Dig("00") call Put_Dig("el") call assert_equal(['␀', 'ü', '∞', 'l'], getline(line('.')-3,line('.'))) - " reset encoding option - let &enc = _enc bw! endfunc func! Test_digraphs_option() - let _enc=&enc " reset whichwrap option, so that testing A works, " without moving up a line ! set enc=utf8 digraph ww= new call Put_Dig_BS("0","0") call assert_equal("∞", getline('.')) --- 214,226 ---- call Put_Dig("00") call Put_Dig("el") call assert_equal(['␀', 'ü', '∞', 'l'], getline(line('.')-3,line('.'))) bw! endfunc func! Test_digraphs_option() " reset whichwrap option, so that testing A works, " without moving up a line ! set digraph ww= new call Put_Dig_BS("0","0") call assert_equal("∞", getline('.')) *************** *** 423,430 **** call Put_Dig_BS("0","0") call Put_Dig_BS("e","l") call assert_equal(['␀', 'ü', '∞', 'l'], getline(line('.')-3,line('.'))) - " reset encoding option - let &enc = _enc set nodigraph ww&vim bw! endfunc --- 419,424 ---- *** ../vim-7.4.2084/src/version.c 2016-07-20 22:23:45.417515463 +0200 --- src/version.c 2016-07-21 10:10:20.043337288 +0200 *************** *** 760,761 **** --- 760,763 ---- { /* Add new patch number below this line */ + /**/ + 2085, /**/ -- With sufficient thrust, pigs fly just fine. -- RFC 1925 /// 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 ///