forked from aniani/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)
This commit is contained in:
@@ -2101,6 +2101,7 @@ scroll_cursor_halfway(atend)
|
|||||||
int used;
|
int used;
|
||||||
lineoff_T loff;
|
lineoff_T loff;
|
||||||
lineoff_T boff;
|
lineoff_T boff;
|
||||||
|
linenr_T old_topline = curwin->w_topline;
|
||||||
|
|
||||||
loff.lnum = boff.lnum = curwin->w_cursor.lnum;
|
loff.lnum = boff.lnum = curwin->w_cursor.lnum;
|
||||||
#ifdef FEAT_FOLDING
|
#ifdef FEAT_FOLDING
|
||||||
@@ -2156,6 +2157,8 @@ scroll_cursor_halfway(atend)
|
|||||||
curwin->w_topline = topline;
|
curwin->w_topline = topline;
|
||||||
#ifdef FEAT_DIFF
|
#ifdef FEAT_DIFF
|
||||||
curwin->w_topfill = topfill;
|
curwin->w_topfill = topfill;
|
||||||
|
if (old_topline > curwin->w_topline + curwin->w_height)
|
||||||
|
curwin->w_botfill = FALSE;
|
||||||
check_topfill(curwin, FALSE);
|
check_topfill(curwin, FALSE);
|
||||||
#endif
|
#endif
|
||||||
curwin->w_valid &= ~(VALID_WROW|VALID_CROW|VALID_BOTLINE|VALID_BOTLINE_AP);
|
curwin->w_valid &= ~(VALID_WROW|VALID_CROW|VALID_BOTLINE|VALID_BOTLINE_AP);
|
||||||
|
@@ -738,6 +738,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
173,
|
||||||
/**/
|
/**/
|
||||||
172,
|
172,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user