mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-07 11:58:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.2.3556: filler lines are incorrect for other window in diff mode (#16164)

Browse Source 
Problem:    Filler lines are incorrect for other window in diff mode after
            making a change.
Solution:   Copy filler lines from the current window. (closes vim/vim#8809)
841c225b9e
This commit is contained in:
Jaehwang Jerry Jung
2021-10-29 11:04:57 +09:00
committed by GitHub
parent 4a618b00bc
commit bb79e05f81
3 changed files with 41 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/nvim/diff.c
View File

@@ -638,7 +638,8 @@ static int diff_check_sanity(tabpage_T *tp, diff_T *dp)
void diff_redraw(bool dofold)
{
win_T *wp_other = NULL;
bool used_max_fill = false;
bool used_max_fill_other = false;
bool used_max_fill_curwin = false;
need_diff_redraw = false;
FOR_ALL_WINDOWS_IN_TAB(wp, curtab) {
@@ -663,16 +664,24 @@ void diff_redraw(bool dofold)
} else if ((n > 0) && (n > wp->w_topfill)) {
wp->w_topfill = n;
if (wp == curwin) {
used_max_fill = true;
used_max_fill_curwin = true;
} else if (wp_other != NULL) {
used_max_fill_other = true;
}
}
check_topfill(wp, false);
}
}
if (wp_other != NULL && used_max_fill && curwin->w_p_scb) {
// The current window was set to used the maximum number of filler
// lines, may need to reduce them.
diff_set_topline(wp_other, curwin);
if (wp_other != NULL && curwin->w_p_scb) {
if (used_max_fill_curwin) {
// The current window was set to used the maximum number of filler
// lines, may need to reduce them.
diff_set_topline(wp_other, curwin);
} else if (used_max_fill_other) {
// The other window was set to used the maximum number of filler
// lines, may need to reduce them.
diff_set_topline(curwin, wp_other);
}
}
}