diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-07-21 10:11:03 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-07-21 10:11:03 +0200 |
| commit | dfd63e30d13fff5603416b6c7e247cebeb003eb0 (patch) | |
| tree | 35c5e6c3695499467842187e68c4ebd415fb19f6 | |
| parent | 60084333816c585d5858bc085b2942f813102ae3 (diff) | |
| download | vim-git-7.4.2085.tar.gz | |
patch 7.4.2085v7.4.2085
Problem: Digraph tests fails on some systems.
Solution: Run it separately and set 'encoding' early.
| -rw-r--r-- | src/testdir/Make_all.mak | 1 | ||||
| -rw-r--r-- | src/testdir/test_alot.vim | 1 | ||||
| -rw-r--r-- | src/testdir/test_digraph.vim | 10 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 5 insertions, 9 deletions
diff --git a/src/testdir/Make_all.mak b/src/testdir/Make_all.mak index 9b8770d53..11cc93429 100644 --- 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 \ diff --git a/src/testdir/test_alot.vim b/src/testdir/test_alot.vim index e87ff90eb..e9c84398e 100644 --- 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 diff --git a/src/testdir/test_digraph.vim b/src/testdir/test_digraph.vim index b12e19fa7..60ae1fd3f 100644 --- 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 diff --git a/src/version.c b/src/version.c index 167d40558..6f9ce5d30 100644 --- a/src/version.c +++ b/src/version.c @@ -759,6 +759,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2085, +/**/ 2084, /**/ 2083, |