updated for version 7.4.639
Problem: Combination of linebreak and conceal doesn't work well.
Solution: Fix the display problems. (Christian Brabandt)
diff --git a/src/testdir/test88.in b/src/testdir/test88.in
index c2e6a75..9e43f70 100644
--- a/src/testdir/test88.in
+++ b/src/testdir/test88.in
@@ -71,6 +71,17 @@
:set lbr
:normal $
GGk
+:set list listchars=tab:>-
+:normal 0
+GGk
+:normal W
+GGk
+:normal W
+GGk
+:normal W
+GGk
+:normal $
+GGk
:" Display result.
:call append('$', 'end:')
:call append('$', positions)
diff --git a/src/testdir/test88.ok b/src/testdir/test88.ok
index e29698b..12949f2 100644
--- a/src/testdir/test88.ok
+++ b/src/testdir/test88.ok
@@ -22,3 +22,8 @@
9:25
9:26
9:26
+9:1
+9:9
+9:17
+9:25
+9:26
diff --git a/src/testdir/test_listlbr_utf8.in b/src/testdir/test_listlbr_utf8.in
index bb6350d..7448142 100644
--- a/src/testdir/test_listlbr_utf8.in
+++ b/src/testdir/test_listlbr_utf8.in
@@ -56,6 +56,41 @@
:redraw!
:let line=ScreenChar(winwidth(0),7)
:call DoRecordScreen()
+:let g:test ="Test 5: set linebreak list listchars and concealing part2"
+:let c_defines=['bbeeeeee ; some text']
+:call append('$', c_defines)
+:$
+:norm! zt
+:set nowrap ts=2 list linebreak listchars=tab:>- cole=2 concealcursor=n
+:syn clear
+:syn match meaning /;\s*\zs.*/
+:syn match hasword /^\x\{8}/ contains=word
+:syn match word /\<\x\{8}\>/ contains=beginword,endword contained
+:syn match beginword /\<\x\x/ contained conceal
+:syn match endword /\x\{6}\>/ contained
+:hi meaning guibg=blue
+:hi beginword guibg=green
+:hi endword guibg=red
+:redraw!
+:let line=ScreenChar(winwidth(0),1)
+:call DoRecordScreen()
+:let g:test ="Test 6: Screenattributes for comment"
+:$put =g:test
+:call append('$', ' /* and some more */')
+:exe "set ft=c ts=7 linebreak list listchars=nbsp:\u2423,tab:\u2595\u2014,trail:\u02d1,eol:\ub6"
+:syntax on
+:hi SpecialKey term=underline ctermfg=red guifg=red
+:let attr=[]
+:nnoremap <expr> GG ":let attr += ['".screenattr(screenrow(),screencol())."']\n"
+:$
+:norm! zt0
+GGlGGlGGlGGlGGlGGlGGlGGlGGlGGl
+:call append('$', ['ScreenAttributes for test6:'])
+:if attr[0] != attr[1] && attr[1] != attr[3] && attr[3] != attr[5]
+: call append('$', "Attribut 0 and 1 and 3 and 5 are different!")
+:else
+: call append('$', "Not all attributes are different")
+:endif
:%w! test.out
:qa!
ENDTEST
diff --git a/src/testdir/test_listlbr_utf8.ok b/src/testdir/test_listlbr_utf8.ok
index b90e696..5bd35bd 100644
--- a/src/testdir/test_listlbr_utf8.ok
+++ b/src/testdir/test_listlbr_utf8.ok
@@ -36,3 +36,11 @@
#define >_FILE>--------->--->---1
#define >_CONSOLE>---------->---2
#define >_FILE_AND_CONSOLE>---------3
+bbeeeeee ; some text
+
+Test 5: set linebreak list listchars and concealing part2
+eeeeee>--->-;>some text
+Test 6: Screenattributes for comment
+ /* and some more */
+ScreenAttributes for test6:
+Attribut 0 and 1 and 3 and 5 are different!