diff options
| author | Bram Moolenaar <Bram@vim.org> | 2012-10-21 22:18:21 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2012-10-21 22:18:21 +0200 |
| commit | a80888d296f97ed28a4debc5019a7bbe86cd9121 (patch) | |
| tree | d8f09728663186c8cf0e7759cfdb280459575756 /src/diff.c | |
| parent | 17aa8cc255d313ac33eca4f2727ed2a6b8bdd8ef (diff) | |
| download | vim-git-a80888d296f97ed28a4debc5019a7bbe86cd9121.tar.gz | |
updated for version 7.3.708v7.3.708
Problem: Filler lines above the first line may be hidden when opening Vim.
Solution: Change how topfill is computed. (Christian Brabandt)
Diffstat (limited to 'src/diff.c')
| -rw-r--r-- | src/diff.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/diff.c b/src/diff.c index d9aaec828..864e60914 100644 --- a/src/diff.c +++ b/src/diff.c @@ -615,11 +615,13 @@ diff_redraw(dofold) #endif /* A change may have made filler lines invalid, need to take care * of that for other windows. */ - if (wp != curwin && wp->w_topfill > 0) + n = diff_check(wp, wp->w_topline); + if ((wp != curwin && wp->w_topfill > 0) || n > 0) { - n = diff_check(wp, wp->w_topline); if (wp->w_topfill > n) wp->w_topfill = (n < 0 ? 0 : n); + else if (n > 0 && n > wp->w_topfill) + wp->w_topfill = n; } } } |