Mercurial > vim
changeset 7316:6170f4945b83 v7.4.963
commit https://github.com/vim/vim/commit/1c57fe8b9450eb29c3e42a94527d4b7514f853e2
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Dec 6 14:53:18 2015 +0100
patch 7.4.963
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 https://github.com/vim/vim/issues/518)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sun, 06 Dec 2015 15:00:04 +0100 |
| parents | 444efa5f5015 |
| children | 9061e3d5a6bb |
| files | src/testdir/test_listlbr_utf8.in src/testdir/test_listlbr_utf8.ok src/version.c |
| diffstat | 3 files changed, 7 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/src/testdir/test_listlbr_utf8.in +++ b/src/testdir/test_listlbr_utf8.in @@ -4,6 +4,7 @@ STARTTEST :so small.vim :if !exists("+linebreak") || !has("conceal") || !has("signs") | e! test.ok | w! test.out | qa! | endif :so mbyte.vim +:set encoding=utf8 :if &enc !=? 'utf-8'|:e! test.ok|:w! test.out|qa!|endif :10new|:vsp|:vert resize 20 :put =\"\tabcdef hijklmn\tpqrstuvwxyz\u00a01060ABCDEFGHIJKLMNOP \" @@ -109,7 +110,7 @@ Golong line: 40afoobar aTARGETÃ' at end :$put ='a b c' :$put ='a b c' :set list nolinebreak cc=3 -:sign define foo text=ï¼ +:sign define foo text=uff0b :sign place 1 name=foo line=50 buffer=2 :norm! 2kztj :let line1=line('.') @@ -121,8 +122,6 @@ 0GGlGGlGGlGGl :redraw! :let line=ScreenChar(winwidth(0),3) :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 :if attr[0] != attr2[0] || attr[1] != attr2[1] || attr[2] != attr2[2] : call append('$', "Screen attributes are different!")
--- a/src/testdir/test_listlbr_utf8.ok +++ b/src/testdir/test_listlbr_utf8.ok @@ -51,10 +51,7 @@ a b c a b c Test 9: a multibyte sign and colorcolumn - ¶ -ï¼a b c¶ - a b c¶ -ScreenAttributes for test9: -Line: 50 ['0', '0', '72', '0'] -Line: 51 ['0', '0', '72', '0'] + ¶ +＋a b c¶ + a b c¶ Screen attributes are the same!