Mercurial > vim
diff src/diff.c @ 26044:2e8226c03007 v8.2.3556
patch 8.2.3556: filler lines are incorrect for other window in diff mode
Commit: https://github.com/vim/vim/commit/841c225b9ef8c5bdf5e02968a0bd62521fff6ca8
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri Oct 22 20:56:55 2021 +0100
patch 8.2.3556: filler lines are incorrect for other window in diff mode
Problem: Filler lines are incorrect for other window in diff mode after
making a change.
Solution: Copy filler lines from the current window. (closes #8809)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Fri, 22 Oct 2021 22:00:05 +0200 |
| parents | d3f992bc6ef8 |
| children | fac6673086df |
line wrap: on
line diff
--- a/src/diff.c +++ b/src/diff.c @@ -656,7 +656,8 @@ diff_redraw( { win_T *wp; win_T *wp_other = NULL; - int used_max_fill = FALSE; + int used_max_fill_other = FALSE; + int used_max_fill_curwin = FALSE; int n; need_diff_redraw = FALSE; @@ -681,16 +682,25 @@ diff_redraw( { 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); + } } static void