0
0
mirror of https://github.com/vim/vim.git synced 2025-10-17 07:44:28 -04:00

patch 9.0.2151: 'breakindent' is not drawn after diff filler lines

Problem:  'breakindent' is not drawn after diff filler lines.
Solution: Correct check for whether 'breakindent' should be drawn.

closes: #13624

Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
zeertzjq
2023-12-05 15:47:09 +01:00
committed by Christian Brabandt
parent 2103a56eab
commit 588f20dece
4 changed files with 45 additions and 14 deletions

View File

@@ -498,10 +498,11 @@ handle_breakindent(win_T *wp, winlinevars_T *wlv)
{
wlv->draw_state = WL_BRI;
// if wlv->need_showbreak is set, breakindent also applies
if (wp->w_p_bri && (wlv->row != wlv->startrow || wlv->need_showbreak)
if (wp->w_p_bri && (wlv->row > wlv->startrow
# ifdef FEAT_DIFF
&& wlv->filler_lines == 0
+ wlv->filler_lines
# endif
|| wlv->need_showbreak)
# ifdef FEAT_PROP_POPUP
&& !wlv->dont_use_showbreak
# endif