updated for version 7.4.352
Problem: With 'linebreak' a tab causes a missing line break.
Solution: Count a tab for what it's worth also for shorter lines.
(Christian Brabandt)
diff --git a/src/charset.c b/src/charset.c
index 1ffaf46..0b9f4b8 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -1078,6 +1078,7 @@
int c;
int size;
colnr_T col2;
+ colnr_T col_adj = 0; /* col + screen size of tab */
colnr_T colmax;
int added;
# ifdef FEAT_MBYTE
@@ -1109,6 +1110,8 @@
*/
size = win_chartabsize(wp, s, col);
c = *s;
+ if (tab_corr)
+ col_adj = size - 1;
/*
* If 'linebreak' set check at a blank before a non-blank if the line
@@ -1130,12 +1133,13 @@
*/
numberextra = win_col_off(wp);
col2 = col;
- colmax = (colnr_T)(W_WIDTH(wp) - numberextra);
+ colmax = (colnr_T)(W_WIDTH(wp) - numberextra - col_adj);
if (col >= colmax)
{
- n = colmax + win_col_off2(wp);
+ colmax += col_adj;
+ n = colmax + win_col_off2(wp);
if (n > 0)
- colmax += (((col - colmax) / n) + 1) * n;
+ colmax += (((col - colmax) / n) + 1) * n - col_adj;
}
for (;;)
@@ -1152,7 +1156,7 @@
col2 += win_chartabsize(wp, s, col2);
if (col2 >= colmax) /* doesn't fit */
{
- size = colmax - col;
+ size = colmax - col + col_adj;
tab_corr = FALSE;
break;
}
diff --git a/src/version.c b/src/version.c
index 94f16b3..2fd9dfb 100644
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 352,
+/**/
351,
/**/
350,
