summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/move.c3
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 0 deletions
diff --git a/src/move.c b/src/move.c
index 5c825744..3a75ce36 100644
--- a/src/move.c
+++ b/src/move.c
@@ -2101,6 +2101,7 @@ scroll_cursor_halfway(atend)
int used;
lineoff_T loff;
lineoff_T boff;
+ linenr_T old_topline = curwin->w_topline;
loff.lnum = boff.lnum = curwin->w_cursor.lnum;
#ifdef FEAT_FOLDING
@@ -2156,6 +2157,8 @@ scroll_cursor_halfway(atend)
curwin->w_topline = topline;
#ifdef FEAT_DIFF
curwin->w_topfill = topfill;
+ if (old_topline > curwin->w_topline + curwin->w_height)
+ curwin->w_botfill = FALSE;
check_topfill(curwin, FALSE);
#endif
curwin->w_valid &= ~(VALID_WROW|VALID_CROW|VALID_BOTLINE|VALID_BOTLINE_AP);
diff --git a/src/version.c b/src/version.c
index eadd03d1..f0f74369 100644
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 173,
+/**/
172,
/**/
171,