From 7e4f62a2575e8ce9ebb842d4246288138b11dff3 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Thu, 28 Dec 2023 23:19:52 +0100 Subject: 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 Signed-off-by: Christian Brabandt --- src/drawline.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'src/drawline.c') diff --git a/src/drawline.c b/src/drawline.c index 08b6f45c44..7bbe86de0f 100644 --- a/src/drawline.c +++ b/src/drawline.c @@ -524,9 +524,6 @@ handle_breakindent(win_T *wp, winlinevars_T *wlv) 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, winlinevars_T *wlv) 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, winlinevars_T *wlv) 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, winlinevars_T *wlv) 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 -- cgit v1.2.3