Mercurial > vim
changeset 9616:6144d9bfb037 v7.4.2085
commit https://github.com/vim/vim/commit/dfd63e30d13fff5603416b6c7e247cebeb003eb0
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Jul 21 10:11:03 2016 +0200
patch 7.4.2085
Problem: Digraph tests fails on some systems.
Solution: Run it separately and set 'encoding' early.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Thu, 21 Jul 2016 10:15:05 +0200 |
| parents | b00b3aa68217 |
| children | 3682c229ac32 |
| files | src/testdir/Make_all.mak src/testdir/test_alot.vim src/testdir/test_digraph.vim src/version.c |
| diffstat | 4 files changed, 5 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/src/testdir/Make_all.mak +++ b/src/testdir/Make_all.mak @@ -170,6 +170,7 @@ NEW_TESTS = test_arglist.res \ test_channel.res \ test_cmdline.res \ test_cscope.res \ + test_digraph.res \ test_farsi.res \ test_hardcopy.res \ test_history.res \
--- a/src/testdir/test_alot.vim +++ b/src/testdir/test_alot.vim @@ -5,7 +5,6 @@ source test_assign.vim 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
--- a/src/testdir/test_digraph.vim +++ b/src/testdir/test_digraph.vim @@ -4,6 +4,7 @@ if !has("digraphs") || !has("multi_byte" finish endif +set enc=utf-8 scriptencoding utf-8 func! Put_Dig(chars) @@ -15,8 +16,6 @@ func! Put_Dig_BS(char1, char2) endfu func! Test_digraphs() - let _enc = &enc - set enc=utf8 new call Put_Dig("00") call assert_equal("∞", getline('.')) @@ -215,16 +214,13 @@ func! Test_digraphs() 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 <esc><bs>A works, " without moving up a line - set enc=utf8 digraph ww= + set digraph ww= new call Put_Dig_BS("0","0") call assert_equal("∞", getline('.')) @@ -423,8 +419,6 @@ func! Test_digraphs_option() 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