summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/drawscreen.c8
-rw-r--r--src/version.c2
2 files changed, 7 insertions, 3 deletions
diff --git a/src/drawscreen.c b/src/drawscreen.c
index e38ca9586..52f627345 100644
--- a/src/drawscreen.c
+++ b/src/drawscreen.c
@@ -2305,13 +2305,15 @@ win_update(win_T *wp)
++new_rows;
else
#endif
+ {
#ifdef FEAT_DIFF
if (l == wp->w_topline)
- new_rows += plines_win_nofill(wp, l, TRUE)
+ new_rows += plines_win_nofill(wp, l, TRUE)
+ wp->w_topfill;
- else
+ else
#endif
- new_rows += plines_win(wp, l, TRUE);
+ new_rows += plines_win(wp, l, TRUE);
+ }
++j;
if (new_rows > wp->w_height - row - 2)
{
diff --git a/src/version.c b/src/version.c
index 6599ae05a..555bd8eb6 100644
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 3535,
+/**/
3534,
/**/
3533,