mirror of
https://github.com/vim/vim.git
synced 2025-07-26 11:04:33 -04:00
updated for version 7.2-277
This commit is contained in:
parent
2ac5e603d8
commit
fa316dd1f7
@ -183,9 +183,6 @@ update_topline()
|
|||||||
if (curwin->w_topline != 1)
|
if (curwin->w_topline != 1)
|
||||||
redraw_later(NOT_VALID);
|
redraw_later(NOT_VALID);
|
||||||
curwin->w_topline = 1;
|
curwin->w_topline = 1;
|
||||||
#ifdef FEAT_DIFF
|
|
||||||
curwin->w_topfill = 0;
|
|
||||||
#endif
|
|
||||||
curwin->w_botline = 2;
|
curwin->w_botline = 2;
|
||||||
curwin->w_valid |= VALID_BOTLINE|VALID_BOTLINE_AP;
|
curwin->w_valid |= VALID_BOTLINE|VALID_BOTLINE_AP;
|
||||||
#ifdef FEAT_SCROLLBIND
|
#ifdef FEAT_SCROLLBIND
|
||||||
@ -1257,7 +1254,8 @@ scrolldown(line_count, byfold)
|
|||||||
while (line_count-- > 0)
|
while (line_count-- > 0)
|
||||||
{
|
{
|
||||||
#ifdef FEAT_DIFF
|
#ifdef FEAT_DIFF
|
||||||
if (curwin->w_topfill < diff_check(curwin, curwin->w_topline))
|
if (curwin->w_topfill < diff_check(curwin, curwin->w_topline)
|
||||||
|
&& curwin->w_topfill < curwin->w_height - 1)
|
||||||
{
|
{
|
||||||
++curwin->w_topfill;
|
++curwin->w_topfill;
|
||||||
++done;
|
++done;
|
||||||
|
@ -676,6 +676,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 */
|
||||||
|
/**/
|
||||||
|
277,
|
||||||
/**/
|
/**/
|
||||||
276,
|
276,
|
||||||
/**/
|
/**/
|
||||||
|
Loading…
x
Reference in New Issue
Block a user