IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:7.4.963

Browse Source 
Problem:    test_listlbr_utf8 sometimes fails.
Solution:   Don't use a literal multibyte character but <C-V>uXXXX. Do not
            dump the screen highlighting. (Christian Brabandt, closes #518)

1c57fe8b94
This commit is contained in:
watiko 2016-01-25 12:09:17 +09:00
parent 8721e1fe08
commit db51ff10f4
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvim/version.c
View File

@ -161,7 +161,7 @@ static int included_patches[] = {
// 966 NA // 966 NA
// 965 NA // 965 NA
// 964 NA // 964 NA
// 963, 963,
// 962 NA // 962 NA
// 961, // 961,
// 960 NA // 960 NA

15
test/functional/legacy/listlbr_utf8_spec.lua
View File

@ -120,7 +120,9 @@ describe('linebreak', function()
$put ='a b c' $put ='a b c'
$put ='a b c' $put ='a b c'
set list nolinebreak cc=3 set list nolinebreak cc=3
sign define foo text=＋ ]])
feed(':sign define foo text=<C-v>uff0b<CR>')
source([[
sign place 1 name=foo line=50 buffer=2 sign place 1 name=foo line=50 buffer=2
norm! 2kztj norm! 2kztj
let line1=line('.') let line1=line('.')
@ -136,8 +138,6 @@ describe('linebreak', function()
redraw! redraw!
let line=ScreenChar(winwidth(0),3) let line=ScreenChar(winwidth(0),3)
call DoRecordScreen() call DoRecordScreen()
call append('$', ['ScreenAttributes for test9:'])
call append('$', ["Line: ".line1. " ". string(g:attr),"Line: ".line2. " ". string(g:attr2)])
" expected: attr[2] is different because of colorcolumn " expected: attr[2] is different because of colorcolumn
if attr[0] != attr2[0] || attr[1] != attr2[1] || attr[2] != attr2[2] if attr[0] != attr2[0] || attr[1] != attr2[1] || attr[2] != attr2[2]
call append('$', "Screen attributes are different!") call append('$', "Screen attributes are different!")
@ -201,12 +201,9 @@ describe('linebreak', function()
a b c a b c
Test 9: a multibyte sign and colorcolumn Test 9: a multibyte sign and colorcolumn
Â
＋a b c ＋a b c
a b c a b c
ScreenAttributes for test9:
Line: 50 ['0', '0', '72', '0']
Line: 51 ['0', '0', '72', '0']
Screen attributes are the same!]]) Screen attributes are the same!]])
end) end)
end) end)