mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-05 09:26:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.0.2151: 'breakindent' is not drawn after diff filler lines (#26412)

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

closes: vim/vim#13624

588f20dece

Cherry-pick Test_diff_with_syntax() change from patch 9.0.1257.
This commit is contained in:
zeertzjq
2023-12-06 07:16:02 +08:00
committed by GitHub
parent 4a1abc91a0
commit 06ff540e1c
3 changed files with 69 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/nvim/drawline.c
View File

@@ -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);