patch 8.1.0811: too many #ifdefs
Problem: Too many #ifdefs.
Solution: Graduate FEAT_MBYTE, the final chapter.
diff --git a/src/testdir/test_edit.vim b/src/testdir/test_edit.vim
index 7b31469..9a60d01 100644
--- a/src/testdir/test_edit.vim
+++ b/src/testdir/test_edit.vim
@@ -37,12 +37,10 @@
call assert_equal([''], getline(1,'$'))
%d
" 4) delete a multibyte character
- if has("multi_byte")
- call setline(1, "\u0401")
- call feedkeys("i\<del>\<esc>", 'tnix')
- call assert_equal([''], getline(1,'$'))
- %d
- endif
+ call setline(1, "\u0401")
+ call feedkeys("i\<del>\<esc>", 'tnix')
+ call assert_equal([''], getline(1,'$'))
+ %d
" 5.1) delete linebreak with 'bs' option containing eol
let _bs=&bs
set bs=eol
@@ -440,7 +438,7 @@
func Test_edit_CTRL_()
" disabled for Windows builds, why?
- if !has("multi_byte") || !has("rightleft") || has("win32")
+ if !has("rightleft") || has("win32")
return
endif
let _encoding=&encoding
@@ -608,15 +606,14 @@
endtry
call delete('Xdictionary.txt')
- if has("multi_byte")
- call test_override("char_avail", 1)
- set showcmd
- %d
- call feedkeys("A\<c-k>a:\<esc>", 'tnix')
- call assert_equal(['ä'], getline(1, '$'))
- call test_override("char_avail", 0)
- set noshowcmd
- endif
+ call test_override("char_avail", 1)
+ set showcmd
+ %d
+ call feedkeys("A\<c-k>a:\<esc>", 'tnix')
+ call assert_equal(['ä'], getline(1, '$'))
+ call test_override("char_avail", 0)
+ set noshowcmd
+
bw!
endfunc