From 54495c9816c19d19b10a89825b63b745de6ecfa7 Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Wed, 11 Nov 2020 23:57:05 -0500 Subject: vim-patch:8.1.0811: too many #ifdefs Problem: Too many #ifdefs. Solution: Graduate FEAT_MBYTE, the final chapter. https://github.com/vim/vim/commit/30276f2beb248557c6b33cd5418bca8b7084b0a5 --- src/nvim/testdir/test_digraph.vim | 3 --- src/nvim/testdir/test_plus_arg_edit.vim | 4 ---- src/nvim/testdir/test_search.vim | 2 +- 3 files changed, 1 insertion(+), 8 deletions(-) (limited to 'src') diff --git a/src/nvim/testdir/test_digraph.vim b/src/nvim/testdir/test_digraph.vim index 1792dcc00b..9eea27740d 100644 --- a/src/nvim/testdir/test_digraph.vim +++ b/src/nvim/testdir/test_digraph.vim @@ -479,9 +479,6 @@ endfunc func Test_show_digraph_cp1251() throw 'skipped: Nvim supports ''utf8'' encoding only' - if !has('multi_byte') - return - endif new set encoding=cp1251 call Put_Dig("='") diff --git a/src/nvim/testdir/test_plus_arg_edit.vim b/src/nvim/testdir/test_plus_arg_edit.vim index e91a6e467a..e31680e7b6 100644 --- a/src/nvim/testdir/test_plus_arg_edit.vim +++ b/src/nvim/testdir/test_plus_arg_edit.vim @@ -10,10 +10,6 @@ function Test_edit() endfunction func Test_edit_bad() - if !has('multi_byte') - finish - endif - " Test loading a utf8 file with bad utf8 sequences. call writefile(["[\xff][\xc0][\xe2\x89\xf0][\xc2\xc2]"], "Xfile") new diff --git a/src/nvim/testdir/test_search.vim b/src/nvim/testdir/test_search.vim index 5db23c22a8..6824c50112 100644 --- a/src/nvim/testdir/test_search.vim +++ b/src/nvim/testdir/test_search.vim @@ -1053,7 +1053,7 @@ func Test_search_Ctrl_L_combining() " ' ̇' U+0307 Dec:775 COMBINING DOT ABOVE ̇ /\%u307\Z "\u0307" " ' ̣' U+0323 Dec:803 COMBINING DOT BELOW ̣ /\%u323 "\u0323" " Those should also appear on the commandline - if !has('multi_byte') || !exists('+incsearch') + if !exists('+incsearch') return endif call Cmdline3_prep() -- cgit