diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-03-03 23:06:48 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-03-03 23:06:48 +0100 |
| commit | 36ddf9383181f93b080eb26121bdff37e394d2db (patch) | |
| tree | 8c66f64740b9d323ebcff24f949f9f2cabf929ee /src | |
| parent | 3e919d2924c87eb8fee62603788fcc3ced2a0031 (diff) | |
| download | vim-git-36ddf9383181f93b080eb26121bdff37e394d2db.tar.gz | |
patch 8.2.0352: FreeBSD: test for sourcing utf-8 is skippedv8.2.0352
Problem: FreeBSD: test for sourcing utf-8 is skipped.
Solution: Run the matchadd_conceal test separately to avoid that setting
'term' to "ansi" causes problems for other tests. (Ozaki Kiichi,
closes #5721)
Diffstat (limited to 'src')
| -rw-r--r-- | src/testdir/Make_all.mak | 1 | ||||
| -rw-r--r-- | src/testdir/test_alot_utf8.vim | 1 | ||||
| -rw-r--r-- | src/testdir/test_source_utf8.vim | 29 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 16 insertions, 17 deletions
diff --git a/src/testdir/Make_all.mak b/src/testdir/Make_all.mak index 3a4979bf3..fab86568a 100644 --- a/src/testdir/Make_all.mak +++ b/src/testdir/Make_all.mak @@ -398,6 +398,7 @@ NEW_TESTS_RES = \ test_marks.res \ test_match.res \ test_matchadd_conceal.res \ + test_matchadd_conceal_utf8.res \ test_memory_usage.res \ test_messages.res \ test_method.res \ diff --git a/src/testdir/test_alot_utf8.vim b/src/testdir/test_alot_utf8.vim index be0bd0141..11de05580 100644 --- a/src/testdir/test_alot_utf8.vim +++ b/src/testdir/test_alot_utf8.vim @@ -7,7 +7,6 @@ source test_charsearch_utf8.vim source test_expr_utf8.vim source test_listlbr_utf8.vim -source test_matchadd_conceal_utf8.vim source test_mksession_utf8.vim source test_regexp_utf8.vim source test_source_utf8.vim diff --git a/src/testdir/test_source_utf8.vim b/src/testdir/test_source_utf8.vim index 99cb09c50..66fabe044 100644 --- a/src/testdir/test_source_utf8.vim +++ b/src/testdir/test_source_utf8.vim @@ -3,8 +3,6 @@ source check.vim func Test_source_utf8() " check that sourcing a script with 0x80 as second byte works - " does not work correctly on BSD - CheckNotBSD new call setline(1, [':%s/àx/--à1234--/g', ':%s/Àx/--À1234--/g']) write! Xscript @@ -34,25 +32,24 @@ endfunc " Test for sourcing a file with CTRL-V's at the end of the line func Test_source_ctrl_v() - CheckNotBSD - call writefile(['map __1 afirst', - \ 'map __2 asecond', - \ 'map __3 athird', - \ 'map __4 afourth', - \ 'map __5 afifth', - \ "map __1 asd\<C-V>", - \ "map __2 asd\<C-V>\<C-V>", - \ "map __3 asd\<C-V>\<C-V>", - \ "map __4 asd\<C-V>\<C-V>\<C-V>", - \ "map __5 asd\<C-V>\<C-V>\<C-V>", - \ ], 'Xtestfile') + call writefile(['map __1 afirst', + \ 'map __2 asecond', + \ 'map __3 athird', + \ 'map __4 afourth', + \ 'map __5 afifth', + \ "map __1 asd\<C-V>", + \ "map __2 asd\<C-V>\<C-V>", + \ "map __3 asd\<C-V>\<C-V>", + \ "map __4 asd\<C-V>\<C-V>\<C-V>", + \ "map __5 asd\<C-V>\<C-V>\<C-V>", + \ ], 'Xtestfile') source Xtestfile enew! exe "normal __1\<Esc>\<Esc>__2\<Esc>__3\<Esc>\<Esc>__4\<Esc>__5\<Esc>" exe "%s/\<C-J>/0/g" call assert_equal(['sd', - \ "map __2 asd\<Esc>secondsd\<Esc>sd0map __5 asd0fifth"], - \ getline(1, 2)) + \ "map __2 asd\<Esc>secondsd\<Esc>sd0map __5 asd0fifth"], + \ getline(1, 2)) enew! call delete('Xtestfile') diff --git a/src/version.c b/src/version.c index b9fc30ac2..19dc616c5 100644 --- a/src/version.c +++ b/src/version.c @@ -739,6 +739,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 352, +/**/ 351, /**/ 350, |