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 #518)

diff --git a/src/testdir/test_listlbr_utf8.in b/src/testdir/test_listlbr_utf8.in
index c8bbe103c913fcd38bba697adc00c0dd269939b0..de716a3c1e09a822e82390893eebffbb2fbc0165 100644 (file)
--- 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: \e40afoobar \eaTARGETÃ' at end\e
 :$put ='a b c'
 :$put ='a b c'
 :set list nolinebreak cc=3
-:sign define foo text=ï¼\8b
+:sign define foo text=\16uff0b
 :sign place 1 name=foo line=50 buffer=2
 :norm! 2kztj
 :let line1=line('.')
@@ -121,8 +122,6 @@ Golong line: \e40afoobar \eaTARGETÃ' at end\e
 :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 490f1a108058506540fa2043350891ab5f90011d..f1573da12f1f13e3bd9d53a09445d37db87740ad 100644 (file)
--- 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
-  ¶                                     
-ï¼\8ba 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 af22fb02843a359521ffba83b181f3906235e449..b18ea0236cb824f62b5d3b27ccb7760f9c07c7ed 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    963,
 /**/
     962,
 /**/