diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-07-20 22:23:49 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-07-20 22:23:49 +0200 |
| commit | 60084333816c585d5858bc085b2942f813102ae3 (patch) | |
| tree | 5735976984130ed09b5c45670fbdfa8f90baa9d3 | |
| parent | 19df5cc04de93519145901d9cbc78c44d0c47c5d (diff) | |
| download | vim-git-60084333816c585d5858bc085b2942f813102ae3.tar.gz | |
patch 7.4.2084v7.4.2084
Problem: New digraph test makes testing hang.
Solution: Don't set "nocp".
| -rw-r--r-- | src/testdir/test_digraph.vim | 12 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 9 insertions, 5 deletions
diff --git a/src/testdir/test_digraph.vim b/src/testdir/test_digraph.vim index 01180b6c2..b12e19fa7 100644 --- a/src/testdir/test_digraph.vim +++ b/src/testdir/test_digraph.vim @@ -4,6 +4,8 @@ if !has("digraphs") || !has("multi_byte") finish endif +scriptencoding utf-8 + func! Put_Dig(chars) exe "norm! o\<c-k>".a:chars endfu @@ -13,8 +15,8 @@ func! Put_Dig_BS(char1, char2) endfu func! Test_digraphs() - let _enc=&enc - set nocp enc=utf8 + let _enc = &enc + set enc=utf8 new call Put_Dig("00") call assert_equal("∞", getline('.')) @@ -214,7 +216,7 @@ func! Test_digraphs() call Put_Dig("el") call assert_equal(['␀', 'ü', '∞', 'l'], getline(line('.')-3,line('.'))) " reset encoding option - let &enc=_enc + let &enc = _enc bw! endfunc @@ -222,7 +224,7 @@ func! Test_digraphs_option() let _enc=&enc " reset whichwrap option, so that testing <esc><bs>A works, " without moving up a line - set nocp enc=utf8 digraph ww= + set enc=utf8 digraph ww= new call Put_Dig_BS("0","0") call assert_equal("∞", getline('.')) @@ -422,7 +424,7 @@ func! Test_digraphs_option() call Put_Dig_BS("e","l") call assert_equal(['␀', 'ü', '∞', 'l'], getline(line('.')-3,line('.'))) " reset encoding option - let &enc=_enc + let &enc = _enc set nodigraph ww&vim bw! endfunc diff --git a/src/version.c b/src/version.c index 69da11921..167d40558 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 */ /**/ + 2084, +/**/ 2083, /**/ 2082, |