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 5c8257449c16c6f378074fda21c8c18c7893a824..3a75ce36a4f22b431761e1f0f6cb459a931eda03 100644 (file)
--- 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 eadd03d1093e4ff0cabd6d4f34994834dafdf050..f0f743693c322392711ed36209d836925bdfb0a0 100644 (file)
--- 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,
 /**/