diff options
| author | lonerover <pathfinder1644@yahoo.com> | 2017-01-04 12:23:00 +0800 |
|---|---|---|
| committer | James McCoy <jamessan@jamessan.com> | 2017-02-09 22:13:03 -0500 |
| commit | 775dfc600078a7f57602041bb87657504239a021 (patch) | |
| tree | 8fcf2e2b4423bbef29153a2a2879e6bd92dd284d | |
| parent | fb177c2c48138ccf4cdc50f55100b71fe96f7d3c (diff) | |
| download | rneovim-775dfc600078a7f57602041bb87657504239a021.tar.gz rneovim-775dfc600078a7f57602041bb87657504239a021.tar.bz2 rneovim-775dfc600078a7f57602041bb87657504239a021.zip | |
vim-patch:7.4.2084
Problem: New digraph test makes testing hang.
Solution: Don't set "nocp".
https://github.com/vim/vim/commit/60084333816c585d5858bc085b2942f813102ae3
| -rw-r--r-- | src/nvim/testdir/test_digraph.vim | 12 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 8 insertions, 6 deletions
diff --git a/src/nvim/testdir/test_digraph.vim b/src/nvim/testdir/test_digraph.vim index 01180b6c25..b12e19fa7c 100644 --- a/src/nvim/testdir/test_digraph.vim +++ b/src/nvim/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/nvim/version.c b/src/nvim/version.c index dca7a4ebaf..ab7af85815 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -356,7 +356,7 @@ static int included_patches[] = { // 2087, 2086, // 2085, - // 2084, + 2084, // 2083, 2082, 2081, |