Mercurial > vim
changeset 34043:fe05c1fb02f8 v9.0.2189
patch 9.0.2189: Wrong display with 'briopt=sbr' and 'nobreakindent'
Commit: https://github.com/vim/vim/commit/7e4f62a2575e8ce9ebb842d4246288138b11dff3
Author: zeertzjq <zeertzjq@outlook.com>
Date: Thu Dec 28 23:19:52 2023 +0100
patch 9.0.2189: Wrong display with 'briopt=sbr' and 'nobreakindent'
Problem: Wrong display when 'breakindentopt' contains "sbr" and
'showbreak' and 'nobreakindent' are set.
Solution: Always reset wlv->need_showbreak regardless of the values of
'breakindent' and 'showbreak', as they aren't checked when
setting wlv->need_showbreak (zeertzjq)
closes: #13785
Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Thu, 28 Dec 2023 23:30:09 +0100 |
| parents | 9ece16460769 |
| children | 6e128d861119 |
| files | src/drawline.c src/testdir/dumps/Test_visual_starts_before_skipcol_4.dump src/version.c |
| diffstat | 3 files changed, 12 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/drawline.c +++ b/src/drawline.c @@ -524,9 +524,6 @@ handle_breakindent(win_T *wp, winlinevar if (wlv->n_extra < 0) wlv->n_extra = 0; } - if (wp->w_skipcol > 0 && wlv->startrow == 0 - && wp->w_p_wrap && wp->w_briopt_sbr) - wlv->need_showbreak = FALSE; // Correct start of highlighted area for 'breakindent', if (wlv->fromcol >= wlv->vcol @@ -538,6 +535,10 @@ handle_breakindent(win_T *wp, winlinevar if (wlv->tocol == wlv->vcol) wlv->tocol += wlv->n_extra; } + + if (wp->w_skipcol > 0 && wlv->startrow == 0 && wp->w_p_wrap + && wp->w_briopt_sbr) + wlv->need_showbreak = FALSE; } } #endif @@ -579,8 +580,6 @@ handle_showbreak_and_filler(win_T *wp, w wlv->c_extra = NUL; wlv->c_final = NUL; wlv->n_extra = (int)STRLEN(sbr); - if (wp->w_skipcol == 0 || wlv->startrow != 0 || !wp->w_p_wrap) - wlv->need_showbreak = FALSE; wlv->vcol_sbr = wlv->vcol + MB_CHARLEN(sbr); // Correct start of highlighted area for 'showbreak'. @@ -599,6 +598,10 @@ handle_showbreak_and_filler(win_T *wp, w wlv->char_attr = hl_combine_attr(wlv->char_attr, wlv->cul_attr); # endif } + + if (wp->w_skipcol == 0 || wlv->startrow > 0 || !wp->w_p_wrap + || !wp->w_briopt_sbr) + wlv->need_showbreak = FALSE; # endif } #endif
--- a/src/testdir/dumps/Test_visual_starts_before_skipcol_4.dump +++ b/src/testdir/dumps/Test_visual_starts_before_skipcol_4.dump @@ -1,5 +1,5 @@ -|++0#4040ff13#ffffff0@8>+@65 -|[+3#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|1|,|2|9|1|-|3|1|0| @5|A|l@1 +|++0#4040ff13#ffffff0@2| +0#0000000#e0e0e08|9|8| |9@1> +0&#ffffff0@65 +|[+3&&|N|o| |N|a|m|e|]| |[|+|]| @43|1|,|2|9|1|-|3|1|0| @5|A|l@1 | +0&&@74 |~+0#4040ff13&| @73 |[+1#0000000&|N|o| |N|a|m|e|]| @47|0|,|0|-|1| @9|A|l@1