diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2023-08-29 09:36:55 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-29 09:36:55 +0800 |
| commit | 794981d9bed7048fb3ee1ada38fcf1ebdace4c53 (patch) | |
| tree | 2f32321ef274eb942e98b6b8ff5c4be336519d4b /src/nvim/plines.c | |
| parent | 7c4d317a660c9d241a817faddc28ec6f36e753ad (diff) | |
| download | rneovim-794981d9bed7048fb3ee1ada38fcf1ebdace4c53.tar.gz rneovim-794981d9bed7048fb3ee1ada38fcf1ebdace4c53.tar.bz2 rneovim-794981d9bed7048fb3ee1ada38fcf1ebdace4c53.zip | |
vim-patch:9.0.1813: linebreak incorrect drawn with breakindent (#24917)
Problem: 'linebreak' is incorrectly drawn after 'breakindent'.
Solution: Don't include 'breakindent' size when already after it.
closes: vim/vim#12937
closes: vim/vim#12940
https://github.com/vim/vim/commit/1d3e0e8f3110a7807431eae056914ccea57b057b
Diffstat (limited to 'src/nvim/plines.c')
| -rw-r--r-- | src/nvim/plines.c | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/src/nvim/plines.c b/src/nvim/plines.c index b95adc1415..e18e774a72 100644 --- a/src/nvim/plines.c +++ b/src/nvim/plines.c @@ -311,6 +311,9 @@ int win_lbr_chartabsize(chartabsize_T *cts, int *headp) int col_off_prev = win_col_off(wp); int width2 = wp->w_width_inner - col_off_prev + win_col_off2(wp); colnr_T wcol = vcol + col_off_prev; + colnr_T max_head_vcol = cts->cts_max_head_vcol; + int added = 0; + // cells taken by 'showbreak'/'breakindent' before current char int head_prev = 0; if (wcol >= wp->w_width_inner) { @@ -326,23 +329,17 @@ int win_lbr_chartabsize(chartabsize_T *cts, int *headp) head_prev += get_breakindent_win(wp, line); } if (wcol < head_prev) { - wcol = head_prev; - } - wcol += col_off_prev; - } - - if ((vcol > 0 && wcol == col_off_prev + head_prev) - || wcol + size > wp->w_width_inner) { - int added = 0; - colnr_T max_head_vcol = cts->cts_max_head_vcol; - - if (vcol > 0 && wcol == col_off_prev + head_prev) { + head_prev -= wcol; + wcol += head_prev; added += head_prev; if (max_head_vcol <= 0 || vcol < max_head_vcol) { head += head_prev; } } + wcol += col_off_prev; + } + if (wcol + size > wp->w_width) { // cells taken by 'showbreak'/'breakindent' halfway current char int head_mid = 0; if (*sbr != NUL) { @@ -379,9 +376,9 @@ int win_lbr_chartabsize(chartabsize_T *cts, int *headp) } } } - - size += added; } + + size += added; } if (headp != NULL) { |