Permalink
Browse files

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)
  • Loading branch information...
1 parent b0e6e48 commit f3c58563f104a526180446aa840ec7c533d6caa3 @brammool brammool committed Oct 21, 2012
Showing with 23 additions and 3 deletions.
  1. +4 −2 src/diff.c
  2. +16 −1 src/testdir/test47.in
  3. +1 −0 src/testdir/test47.ok
  4. +2 −0 src/version.c
View
@@ -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;
}
}
}
View
@@ -36,7 +36,22 @@ j:let three = three . "-" . winline()
:call append("$", two)
:call append("$", three)
:$-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!
ENDTEST
View
@@ -1,3 +1,4 @@
2-4-5-6-8-9
1-2-4-5-8
2-3-4-5-6-7-8
+1
View
@@ -726,6 +726,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 708,
+/**/
707,
/**/
706,

0 comments on commit f3c5856

Please sign in to comment.