From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 11 Feb 2014 14:47:46 +0000 (+0100)
Subject: updated for version 7.4.173
X-Git-Tag: v7.4.173
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=12a0f22340ef1b0fa9a4e96d918e282c3d9c2c4e;p=vim

updated for version 7.4.173
Problem:    When using scrollbind the cursor can end up below the last line.
            (mvxxc)
Solution:   Reset w_botfill when scrolling up. (Christian Brabandt)
---

diff --git a/src/move.c b/src/move.c
index 5c8257449..3a75ce36a 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 eadd03d10..f0f743693 100644
--- a/src/version.c
+++ b/src/version.c
@@ -738,6 +738,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    173,
 /**/
     172,
 /**/