vim-patch:7.4.529 #2270

Problem:    No test for what 7.4.517 fixes.
Solution:   Adjust the tests for breakindent. (Christian Brabandt)

https://github.com/vim/vim/releases/tag/v7-4-529

3 files changed, 31 insertions, 17 deletions

diff --git a/src/nvim/testdir/test_breakindent.in b/src/nvim/testdir/test_breakindent.in
index ad12d0074d..4242e6c266 100644
--- a/src/nvim/testdir/test_breakindent.in
+++ b/src/nvim/testdir/test_breakindent.in
@@ -7,18 +7,18 @@ STARTTEST
 :10new|:vsp|:vert resize 20
 :put =\"\tabcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOP\"
 :set ts=4 sw=4 sts=4 breakindent
-:fu! ScreenChar(width)
+:fu! ScreenChar(line, width)
 :	let c=''
 :	for i in range(1,a:width)
-:		let c.=nr2char(screenchar(line('.'), i))
+:		let c.=nr2char(screenchar(a:line, i))
 :	endfor
 :       let c.="\n"
 :	for i in range(1,a:width)
-:		let c.=nr2char(screenchar(line('.')+1, i))
+:		let c.=nr2char(screenchar(a:line+1, i))
 :	endfor
 :       let c.="\n"
 :	for i in range(1,a:width)
-:		let c.=nr2char(screenchar(line('.')+2, i))
+:		let c.=nr2char(screenchar(a:line+2, i))
 :	endfor
 :	return c
 :endfu
@@ -30,43 +30,43 @@ STARTTEST
 :endfu
 :set briopt=min:0
 :let g:test="Test 1: Simple breakindent"
-:let line1=ScreenChar(8)
+:let line1=ScreenChar(line('.'),8)
 :call DoRecordScreen()
 :let g:test="Test 2: Simple breakindent + sbr=>>"
 :set sbr=>>
-:let line1=ScreenChar(8)
+:let line1=ScreenChar(line('.'),8)
 :call DoRecordScreen()
 :let g:test ="Test 3: Simple breakindent + briopt:sbr"
 :set briopt=sbr,min:0 sbr=++
-:let line1=ScreenChar(8)
+:let line1=ScreenChar(line('.'),8)
 :call DoRecordScreen()
 :let g:test ="Test 4: Simple breakindent + min width: 18"
 :set sbr= briopt=min:18
-:let line1=ScreenChar(8)
+:let line1=ScreenChar(line('.'),8)
 :call DoRecordScreen()
 :let g:test =" Test 5: Simple breakindent + shift by 2"
 :set briopt=shift:2,min:0
-:let line1=ScreenChar(8)
+:let line1=ScreenChar(line('.'),8)
 :call DoRecordScreen()
 :let g:test=" Test 6: Simple breakindent + shift by -1"
 :set briopt=shift:-1,min:0
-:let line1=ScreenChar(8)
+:let line1=ScreenChar(line('.'),8)
 :call DoRecordScreen()
 :let g:test=" Test 7: breakindent + shift by +1 + nu + sbr=? briopt:sbr"
 :set briopt=shift:1,sbr,min:0 nu sbr=? nuw=4
-:let line1=ScreenChar(10)
+:let line1=ScreenChar(line('.'),10)
 :call DoRecordScreen()
 :let g:test=" Test 8: breakindent + shift:1 + nu + sbr=# list briopt:sbr"
 :set briopt=shift:1,sbr,min:0 nu sbr=# list
-:let line1=ScreenChar(10)
+:let line1=ScreenChar(line('.'),10)
 :call DoRecordScreen()
 :let g:test=" Test 9: breakindent + shift by +1 + 'nu' + sbr=# list"
 :set briopt-=sbr
-:let line1=ScreenChar(10)
+:let line1=ScreenChar(line('.'),10)
 :call DoRecordScreen()
 :let g:test=" Test 10: breakindent + shift by +1 + 'nu' + sbr=~ cpo+=n"
 :set cpo+=n sbr=~ nu nuw=4 nolist briopt=sbr,min:0
-:let line1=ScreenChar(10)
+:let line1=ScreenChar(line('.'),10)
 :call DoRecordScreen()
 :wincmd p
 :let g:test="\n Test 11: strdisplaywidth when breakindent is on"
@@ -75,6 +75,14 @@ STARTTEST
 :let width = strlen(text[1:])+indent(2)*4+strlen(&sbr)*3 " text wraps 3 times
 :$put =g:test
 :$put =printf(\"strdisplaywidth: %d == calculated: %d\", strdisplaywidth(text), width)
+:let g:str="\t\t\t\t\t{"
+:let g:test=" Test 12: breakindent + long indent"
+:wincmd p
+:set all& breakindent linebreak briopt=min:10 nu numberwidth=3 ts=4
+:$put =g:str
+zt:let line1=ScreenChar(1,10)
+:wincmd p
+:call DoRecordScreen()
 :"
 :" Test, that the string "    a\tb\tc\td\te" is correctly
 :" displayed in a 20 column wide window (see bug report
@@ -88,7 +96,7 @@ fbgjyl:let line1 = @0
 :?^\s*z
 fygjyl:let line2 = @0
 :quit!
-:$put ='Test 12: breakindent with wrapping Tab'
+:$put ='Test 13: breakindent with wrapping Tab'
 :$put =line1
 :$put =line2
 :"
diff --git a/src/nvim/testdir/test_breakindent.ok b/src/nvim/testdir/test_breakindent.ok
index a530c18fd3..0b16dfce0e 100644
--- a/src/nvim/testdir/test_breakindent.ok
+++ b/src/nvim/testdir/test_breakindent.ok
@@ -53,6 +53,12 @@ Test 4: Simple breakindent + min width: 18
 
  Test 11: strdisplaywidth when breakindent is on
 strdisplaywidth: 46 == calculated: 64
-Test 12: breakindent with wrapping Tab
+					{
+
+ Test 12: breakindent + long indent
+56        
+          
+~         
+Test 13: breakindent with wrapping Tab
 d
 w
diff --git a/src/nvim/version.c b/src/nvim/version.c
index c8dedd7b88..f3ecc6541b 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -211,7 +211,7 @@ static int included_patches[] = {
   //532,
   //531,
   //530,
-  //529,
+  529,
   528,
   527,
   //526,