mirror of
				https://github.com/vim/vim.git
				synced 2025-10-30 09:47:20 -04:00 
			
		
		
		
	patch 8.2.0352: FreeBSD: test for sourcing utf-8 is skipped
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)
			
			
This commit is contained in:
		| @@ -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') | ||||
|   | ||||
		Reference in New Issue
	
	Block a user