Mercurial > vim
changeset 6024:b4962cf3a1c0 v7.4.352
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)
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Wed, 02 Jul 2014 19:37:42 +0200 |
| parents | 65ccaeb4de08 |
| children | ad317f586374 |
| files | src/charset.c src/version.c |
| diffstat | 2 files changed, 10 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/charset.c +++ b/src/charset.c @@ -1078,6 +1078,7 @@ win_lbr_chartabsize(wp, line, s, col, he 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 @@ win_lbr_chartabsize(wp, line, s, col, he */ 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 @@ win_lbr_chartabsize(wp, line, s, col, he */ 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 @@ win_lbr_chartabsize(wp, line, s, col, he col2 += win_chartabsize(wp, s, col2); if (col2 >= colmax) /* doesn't fit */ { - size = colmax - col; + size = colmax - col + col_adj; tab_corr = FALSE; break; }