diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2023-12-06 07:16:02 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-06 07:16:02 +0800 |
| commit | 06ff540e1ca25f4c26670f184d4087f6e3188064 (patch) | |
| tree | 826174abd65921075280bb365a7a66541b976de4 /src | |
| parent | 4a1abc91a0ec71f85239dbaf0ffa1fe42c50e368 (diff) | |
| download | rneovim-06ff540e1ca25f4c26670f184d4087f6e3188064.tar.gz rneovim-06ff540e1ca25f4c26670f184d4087f6e3188064.tar.bz2 rneovim-06ff540e1ca25f4c26670f184d4087f6e3188064.zip | |
vim-patch:9.0.2151: 'breakindent' is not drawn after diff filler lines (#26412)
Problem: 'breakindent' is not drawn after diff filler lines.
Solution: Correct check for whether 'breakindent' should be drawn.
closes: vim/vim#13624
https://github.com/vim/vim/commit/588f20decebebedba3ad733f4f443a597e9747c3
Cherry-pick Test_diff_with_syntax() change from patch 9.0.1257.
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/drawline.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/drawline.c b/src/nvim/drawline.c index e0887ed1d0..77bd05eb55 100644 --- a/src/nvim/drawline.c +++ b/src/nvim/drawline.c @@ -704,8 +704,8 @@ static void handle_breakindent(win_T *wp, winlinevars_T *wlv) if (wlv->draw_state == WL_BRI - 1 && wlv->n_extra == 0) { 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) - && wlv->filler_lines == 0) { + if (wp->w_p_bri && (wlv->row > wlv->startrow + wlv->filler_lines + || wlv->need_showbreak)) { wlv->char_attr = 0; if (wlv->diff_hlf != (hlf_T)0) { wlv->char_attr = win_hl_attr(wp, (int)wlv->diff_hlf); |