Skip to content

Commit b370a11

Browse files
committed
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)
1 parent 115a94d commit b370a11

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

src/move.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2101,6 +2101,7 @@ scroll_cursor_halfway(atend)
21012101
int used;
21022102
lineoff_T loff;
21032103
lineoff_T boff;
2104+
linenr_T old_topline = curwin->w_topline;
21042105

21052106
loff.lnum = boff.lnum = curwin->w_cursor.lnum;
21062107
#ifdef FEAT_FOLDING
@@ -2156,6 +2157,8 @@ scroll_cursor_halfway(atend)
21562157
curwin->w_topline = topline;
21572158
#ifdef FEAT_DIFF
21582159
curwin->w_topfill = topfill;
2160+
if (old_topline > curwin->w_topline + curwin->w_height)
2161+
curwin->w_botfill = FALSE;
21592162
check_topfill(curwin, FALSE);
21602163
#endif
21612164
curwin->w_valid &= ~(VALID_WROW|VALID_CROW|VALID_BOTLINE|VALID_BOTLINE_AP);

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -738,6 +738,8 @@ static char *(features[]) =
738738

739739
static int included_patches[] =
740740
{ /* Add new patch number below this line */
741+
/**/
742+
173,
741743
/**/
742744
172,
743745
/**/

0 commit comments

Comments
 (0)