updated for version 7.4.370

Problem:    Linebreak test fails when encoding is not utf-8. (Danek Duvall)
Solution:   Split the test in a single byte one and a utf-8 one. (Christian
            Brabandt)

diff --git a/src/testdir/Make_amiga.mak b/src/testdir/Make_amiga.mak
index 1226f83c81ff96015c8e7834e30cdf63e4d311f8..60d820ab8784d423900b8cf7e0ec0ab569e651f3 100644 (file)
--- a/src/testdir/Make_amiga.mak
+++ b/src/testdir/Make_amiga.mak
@@ -39,6 +39,7 @@ SCRIPTS = test1.out test3.out test4.out test5.out test6.out \
                test_autoformat_join.out \
                test_breakindent.out \
                test_listlbr.out \
+               test_listlbr_utf8.out \
                test_eval.out \
                test_options.out
 
@@ -167,5 +168,6 @@ test107.out: test107.in
 test_autoformat_join.out: test_autoformat_join.in
 test_breakindent.out: test_breakindent.in
 test_listlbr.out: test_listlbr.in
+test_listlbr_utf8.out: test_listlbr_utf8.in
 test_eval.out: test_eval.in
 test_options.out: test_options.in

diff --git a/src/testdir/Make_dos.mak b/src/testdir/Make_dos.mak
index bffdec521d0d1940702fd21787ac5bbe2e008da7..d715d07767068c918a63dbae88e9e41577dbba6a 100644 (file)
--- a/src/testdir/Make_dos.mak
+++ b/src/testdir/Make_dos.mak
@@ -38,6 +38,7 @@ SCRIPTS =     test3.out test4.out test5.out test6.out test7.out \
                test_autoformat_join.out \
                test_breakindent.out \
                test_listlbr.out \
+               test_listlbr_utf8.out \
                test_eval.out \
                test_options.out
 

diff --git a/src/testdir/Make_ming.mak b/src/testdir/Make_ming.mak
index 603fe8099888563a3ae042fc3613595926a6b69d..8993517693b6897e3edb87d865d53b7cdc0731a6 100644 (file)
--- a/src/testdir/Make_ming.mak
+++ b/src/testdir/Make_ming.mak
@@ -58,6 +58,7 @@ SCRIPTS =     test3.out test4.out test5.out test6.out test7.out \
                test_autoformat_join.out \
                test_breakindent.out \
                test_listlbr.out \
+               test_listlbr_utf8.out \
                test_eval.out \
                test_options.out
 

diff --git a/src/testdir/Make_os2.mak b/src/testdir/Make_os2.mak
index 3de77d2f7bc999f85cd5b8e08f88227b6178c0c9..b37bf2aae538f99af097a4a8ecf9f61cbd923be4 100644 (file)
--- a/src/testdir/Make_os2.mak
+++ b/src/testdir/Make_os2.mak
@@ -40,6 +40,7 @@ SCRIPTS = test1.out test3.out test4.out test5.out test6.out \
                test_autoformat_join.out \
                test_eval.out \
                test_breakindent.out \
+               test_listlbr_utf8.out \
                test_listlbr.out \
                test_options.out
 

diff --git a/src/testdir/Make_vms.mms b/src/testdir/Make_vms.mms
index a506233bf58d7df5d59306e4365ff546ddcaa5c1..9c6f1189a592a75e0f648abf5c796bda4512978f 100644 (file)
--- a/src/testdir/Make_vms.mms
+++ b/src/testdir/Make_vms.mms
@@ -99,6 +99,7 @@ SCRIPT = test1.out  test2.out  test3.out  test4.out  test5.out  \
         test_autoformat_join.out \
         test_breakindent.out \
         test_listlbr.out \
+        test_listlbr_utf8.out \
         test_eval.out \
         test_options.out
 

diff --git a/src/testdir/Makefile b/src/testdir/Makefile
index 49bd80adbfd6641e5a50b220b149c6c106ced8b6..abfef353b893ac4386f69bc51b26882224d53da6 100644 (file)
--- a/src/testdir/Makefile
+++ b/src/testdir/Makefile
@@ -36,6 +36,7 @@ SCRIPTS = test1.out test2.out test3.out test4.out test5.out test6.out \
                test_autoformat_join.out \
                test_breakindent.out \
                test_listlbr.out \
+               test_listlbr_utf8.out \
                test_eval.out \
                test_options.out
 

diff --git a/src/testdir/test_listlbr.in b/src/testdir/test_listlbr.in
index 0d50d4b060bee7af77d019871a333659d5fe9bac..0cce4c23a5ccb6fb231da3ca5c163dc55b8aab53 100644 (file)
--- a/src/testdir/test_listlbr.in
+++ b/src/testdir/test_listlbr.in
@@ -1,10 +1,10 @@
-Test for linebreak and list option
+Test for linebreak and list option (non-utf8)
 
 STARTTEST
 :so small.vim
 :if !exists("+linebreak") | e! test.ok | w! test.out | qa! | endif
 :10new|:vsp|:vert resize 20
-:put =\"\tabcdef hijklmn\tpqrstuvwxyz\u00a01060ABCDEFGHIJKLMNOP \"
+:put =\"\tabcdef hijklmn\tpqrstuvwxyz_1060ABCDEFGHIJKLMNOP \"
 :norm! zt
 :set ts=4 sw=4 sts=4 linebreak sbr=+ wrap
 :fu! ScreenChar(width)
@@ -32,22 +32,12 @@ STARTTEST
 :redraw!
 :let line=ScreenChar(winwidth(0))
 :call DoRecordScreen()
-:let g:test ="Test 3: set linebreak + set list + fancy listchars"
-:exe "set linebreak list listchars=nbsp:\u2423,tab:\u2595\u2014,trail:\u02d1,eol:\ub6"
-:redraw!
-:let line=ScreenChar(winwidth(0))
-:call DoRecordScreen()
-:let g:test ="Test 4: set linebreak nolist"
+:let g:test ="Test 3: set linebreak nolist"
 :set nolist linebreak
 :redraw!
 :let line=ScreenChar(winwidth(0))
 :call DoRecordScreen()
-:let g:test ="Test 5: set nolinebreak list"
-:set list nolinebreak
-:redraw!
-:let line=ScreenChar(winwidth(0))
-:call DoRecordScreen()
-:let g:test ="Test 6: set linebreak with tab and 1 line as long as screen: should break!"
+:let g:test ="Test 4: set linebreak with tab and 1 line as long as screen: should break!"
 :set nolist linebreak ts=8
 :let line="1\t".repeat('a', winwidth(0)-2)
 :$put =line

diff --git a/src/testdir/test_listlbr.ok b/src/testdir/test_listlbr.ok
index f391d50aeaa8e21d76937021ce1b4c56278dd7a3..be323d4dc71fd6e521c96ce4c2a4431a98a261a5 100644 (file)
--- a/src/testdir/test_listlbr.ok
+++ b/src/testdir/test_listlbr.ok
@@ -1,38 +1,26 @@
 
-       abcdef hijklmn  pqrstuvwxyz 1060ABCDEFGHIJKLMNOP 
+       abcdef hijklmn  pqrstuvwxyz_1060ABCDEFGHIJKLMNOP 
 
 Test 1: set linebreak
     abcdef          
 +hijklmn            
-+pqrstuvwxyz 1060ABC
++pqrstuvwxyz_1060ABC
 +DEFGHIJKLMNOP      
 
 Test 2: set linebreak + set list
 ^Iabcdef hijklmn^I  
-+pqrstuvwxyz 1060ABC
++pqrstuvwxyz_1060ABC
 +DEFGHIJKLMNOP      
                     
 
-Test 3: set linebreak + set list + fancy listchars
-▕———abcdef          
-+hijklmn▕———        
-+pqrstuvwxyz␣1060ABC
-+DEFGHIJKLMNOPˑ¶    
-
-Test 4: set linebreak nolist
+Test 3: set linebreak nolist
     abcdef          
 +hijklmn            
-+pqrstuvwxyz 1060ABC
++pqrstuvwxyz_1060ABC
 +DEFGHIJKLMNOP      
-
-Test 5: set nolinebreak list
-▕———abcdef hijklmn▕—
-+pqrstuvwxyz␣1060ABC
-+DEFGHIJKLMNOPˑ¶    
-¶                   
 1      aaaaaaaaaaaaaaaaaa
 
-Test 6: set linebreak with tab and 1 line as long as screen: should break!
+Test 4: set linebreak with tab and 1 line as long as screen: should break!
 1                   
 +aaaaaaaaaaaaaaaaaa 
 ~                   

diff --git a/src/testdir/test_listlbr_utf8.in b/src/testdir/test_listlbr_utf8.in
new file mode 100644 (file)
index 0000000..f8888d5
--- /dev/null
+++ b/src/testdir/test_listlbr_utf8.in
@@ -0,0 +1,41 @@
+Test for linebreak and list option in utf-8 mode
+
+STARTTEST
+:so small.vim
+:if !exists("+linebreak") | e! test.ok | w! test.out | qa! | endif
+:so mbyte.vim
+:if &enc !=? 'utf-8'|:e! test.ok|:w! test.out|qa!|endif
+:10new|:vsp|:vert resize 20
+:put =\"\tabcdef hijklmn\tpqrstuvwxyz\u00a01060ABCDEFGHIJKLMNOP \"
+:norm! zt
+:set ts=4 sw=4 sts=4 linebreak sbr=+ wrap
+:fu! ScreenChar(width)
+:      let c=''
+:      for j in range(1,4)
+:          for i in range(1,a:width)
+:              let c.=nr2char(screenchar(j, i))
+:          endfor
+:           let c.="\n"
+:      endfor
+:      return c
+:endfu
+:fu! DoRecordScreen()
+:      wincmd l
+:      $put =printf(\"\n%s\", g:test)
+:      $put =g:line
+:      wincmd p
+:endfu
+:let g:test ="Test 1: set linebreak + set list + fancy listchars"
+:exe "set linebreak list listchars=nbsp:\u2423,tab:\u2595\u2014,trail:\u02d1,eol:\ub6"
+:redraw!
+:let line=ScreenChar(winwidth(0))
+:call DoRecordScreen()
+:let g:test ="Test 2: set nolinebreak list"
+:set list nolinebreak
+:redraw!
+:let line=ScreenChar(winwidth(0))
+:call DoRecordScreen()
+:%w! test.out
+:qa!
+ENDTEST
+dummy text

diff --git a/src/testdir/test_listlbr_utf8.ok b/src/testdir/test_listlbr_utf8.ok
new file mode 100644 (file)
index 0000000..576ccfb
--- /dev/null
+++ b/src/testdir/test_listlbr_utf8.ok
@@ -0,0 +1,14 @@
+
+       abcdef hijklmn  pqrstuvwxyz 1060ABCDEFGHIJKLMNOP 
+
+Test 1: set linebreak + set list + fancy listchars
+▕———abcdef          
++hijklmn▕———        
++pqrstuvwxyz␣1060ABC
++DEFGHIJKLMNOPˑ¶    
+
+Test 2: set nolinebreak list
+▕———abcdef hijklmn▕—
++pqrstuvwxyz␣1060ABC
++DEFGHIJKLMNOPˑ¶    
+¶                   

diff --git a/src/version.c b/src/version.c
index cd1ce94c5b4cff6bcfdb016b4c8c9fa2d12e454a..6b730cb6885482c2dbaa86df9e20adaf6f1838b7 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    370,
 /**/
     369,
 /**/