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

updated for version 7.3.708

Problem:    Filler lines above the first line may be hidden when opening Vim.
Solution:   Change how topfill is computed. (Christian Brabandt)
This commit is contained in:
Bram Moolenaar
2012-10-21 22:18:21 +02:00
parent 17aa8cc255
commit a80888d296
4 changed files with 23 additions and 3 deletions

View File

@@ -615,11 +615,13 @@ diff_redraw(dofold)
#endif #endif
/* A change may have made filler lines invalid, need to take care /* A change may have made filler lines invalid, need to take care
* of that for other windows. */ * 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) if (wp->w_topfill > n)
wp->w_topfill = (n < 0 ? 0 : n); wp->w_topfill = (n < 0 ? 0 : n);
else if (n > 0 && n > wp->w_topfill)
wp->w_topfill = n;
} }
} }
} }

View File

@@ -36,7 +36,22 @@ j:let three = three . "-" . winline()
:call append("$", two) :call append("$", two)
:call append("$", three) :call append("$", three)
:$-2,$w! test.out :$-2,$w! test.out
:unlet one two three :" Test that diffing shows correct filler lines
:diffoff!
:windo :bw!
:enew
:put =range(4,10)
:1d _
:vnew
:put =range(1,10)
:1d _
:windo :diffthis
:wincmd h
:let w0=line('w0')
:enew
:put =w0
:.w >> test.out
:unlet! one two three w0
:qa! :qa!
ENDTEST ENDTEST

View File

@@ -1,3 +1,4 @@
2-4-5-6-8-9 2-4-5-6-8-9
1-2-4-5-8 1-2-4-5-8
2-3-4-5-6-7-8 2-3-4-5-6-7-8
1

View File

@@ -725,6 +725,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
708,
/**/ /**/
707, 707,
/**/ /**/