aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

patch 8.2.3394: filler lines are wrong when changing text in diff mode

Browse Source 
Problem:    Filler lines are wrong when changing text in diff mode.
Solution:   Don't change the filler lines on every change.  Check
            scrollbinding when updating the filler lines. (closes #8809)
This commit is contained in:
Bram Moolenaar
2021-09-01 16:02:07 +02:00
parent 6631597452
commit 04626c243c
6 changed files with 86 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/diff.c
View File

@@ -655,6 +655,8 @@ diff_redraw(
int dofold) // also recompute the folds
{
win_T *wp;
win_T *wp_other = NULL;
int used_max_fill = FALSE;
int n;
need_diff_redraw = FALSE;
@@ -662,6 +664,8 @@ diff_redraw(
if (wp->w_p_diff)
{
redraw_win_later(wp, SOME_VALID);
if (wp != curwin)
wp_other = wp;
#ifdef FEAT_FOLDING
if (dofold && foldmethodIsDiff(wp))
foldUpdateAll(wp);
@@ -674,10 +678,19 @@ diff_redraw(
if (wp->w_topfill > n)
wp->w_topfill = (n < 0 ? 0 : n);
else if (n > 0 && n > wp->w_topfill)
{
wp->w_topfill = n;
if (wp == curwin)
used_max_fill = 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);
}
static void