updated for version 7.4.422
Problem: When using conceal with linebreak some text is not displayed
correctly. (Grüner Gimpel)
Solution: Check for conceal mode when using linebreak. (Christian Brabandt)
diff --git a/src/screen.c b/src/screen.c
index 4c134f0..7a9311a 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -4514,6 +4514,11 @@
int i;
int saved_nextra = n_extra;
+#ifdef FEAT_CONCEAL
+ if (is_concealing && vcol_off > 0)
+ /* there are characters to conceal */
+ tab_len += vcol_off;
+#endif
/* if n_extra > 0, it gives the number of chars, to
* use for a tab, else we need to calculate the width
* for a tab */
@@ -4539,6 +4544,12 @@
#endif
}
p_extra = p_extra_free;
+#ifdef FEAT_CONCEAL
+ /* n_extra will be increased by FIX_FOX_BOGUSCOLS
+ * macro below, so need to adjust for that here */
+ if (is_concealing && vcol_off > 0)
+ n_extra -= vcol_off;
+#endif
}
#endif
#ifdef FEAT_CONCEAL
diff --git a/src/testdir/test_listlbr.in b/src/testdir/test_listlbr.in
index 0cce4c2..2f28126 100644
--- a/src/testdir/test_listlbr.in
+++ b/src/testdir/test_listlbr.in
@@ -46,6 +46,16 @@
:redraw!
:let line=ScreenChar(winwidth(0))
:call DoRecordScreen()
+:let line="_S_\t bla"
+:$put =line
+:$
+:norm! zt
+:let g:test ="Test 5: set linebreak with conceal and set list and tab displayed by different char (line may not be truncated)"
+:set cpo&vim list linebreak conceallevel=2 concealcursor=nv listchars=tab:ab
+:syn match ConcealVar contained /_/ conceal
+:syn match All /.*/ contains=ConcealVar
+:let line=ScreenChar(winwidth(0))
+:call DoRecordScreen()
:%w! test.out
:qa!
ENDTEST
diff --git a/src/testdir/test_listlbr.ok b/src/testdir/test_listlbr.ok
index be323d4..9b8037f 100644
--- a/src/testdir/test_listlbr.ok
+++ b/src/testdir/test_listlbr.ok
@@ -25,3 +25,10 @@
+aaaaaaaaaaaaaaaaaa
~
~
+_S_ bla
+
+Test 5: set linebreak with conceal and set list and tab displayed by different char (line may not be truncated)
+Sabbbbbb bla
+~
+~
+~
diff --git a/src/version.c b/src/version.c
index d047c9b..31d1b34 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 422,
+/**/
421,
/**/
420,