diff options
| author | Bram Moolenaar <Bram@vim.org> | 2014-07-02 19:37:42 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2014-07-02 19:37:42 +0200 |
| commit | ee739b42c08e15bc9dfa5021f7123b4571287720 (patch) | |
| tree | f885e556946be4572d61e1dbef8b7c2d44876bf0 | |
| parent | c35e3de8cc0786609fd7975416d22e7193f7187d (diff) | |
| download | vim-git-ee739b42c08e15bc9dfa5021f7123b4571287720.tar.gz | |
updated for version 7.4.352v7.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)
| -rw-r--r-- | src/charset.c | 12 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 10 insertions, 4 deletions
diff --git a/src/charset.c b/src/charset.c index 1ffaf467b..0b9f4b8d7 100644 --- a/src/charset.c +++ b/src/charset.c @@ -1078,6 +1078,7 @@ win_lbr_chartabsize(wp, line, s, col, headp) 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, headp) */ 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, headp) */ 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, headp) 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 94f16b3c8..2fd9dfb49 100644 --- a/src/version.c +++ b/src/version.c @@ -735,6 +735,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 352, +/**/ 351, /**/ 350, |