diff options
| author | Bram Moolenaar <Bram@vim.org> | 2015-12-06 14:53:18 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2015-12-06 14:53:18 +0100 |
| commit | 1c57fe8b9450eb29c3e42a94527d4b7514f853e2 (patch) | |
| tree | dfedf9ff5bba94e16f91ebf3014b105ecfb2ff33 | |
| parent | 2c5e8e80eacf491d4f266983f534a77776c7ae83 (diff) | |
patch 7.4.963v7.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 #518)
| -rw-r--r-- | src/testdir/test_listlbr_utf8.in | 5 | ||||
| -rw-r--r-- | src/testdir/test_listlbr_utf8.ok | 9 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 7 insertions, 9 deletions
diff --git a/src/testdir/test_listlbr_utf8.in b/src/testdir/test_listlbr_utf8.in index c8bbe103c9..de716a3c1e 100644 --- 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 @@ Golong line: 40afoobar aTARGETÃ' at end :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!") diff --git a/src/testdir/test_listlbr_utf8.ok b/src/testdir/test_listlbr_utf8.ok index 490f1a1080..f1573da12f 100644 --- 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! diff --git a/src/version.c b/src/version.c index af22fb0284..b18ea0236c 100644 --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 963, +/**/ 962, /**/ 961, |