thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

updated for version 7.2.366

Browse Source 
Problem:    CTRL-B doesn't go back to the first line of the buffer.
Solution:   Avoid an overflow when adding MAXCOL.
This commit is contained in:
Bram Moolenaar
2010-02-17 18:20:37 +01:00
parent 8c83ac3d83
commit bacd9da40e
2 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/move.c
View File

@@ -1610,7 +1610,7 @@ scrollup_clamp()
* Add one line above "lp->lnum". This can be a filler line, a closed fold or * Add one line above "lp->lnum". This can be a filler line, a closed fold or
* a (wrapped) text line. Uses and sets "lp->fill". * a (wrapped) text line. Uses and sets "lp->fill".
* Returns the height of the added line in "lp->height". * Returns the height of the added line in "lp->height".
* Lines above the first one are incredibly high. * Lines above the first one are incredibly high: MAXCOL.
*/ */
static void static void
topline_back(lp) topline_back(lp)
@@ -1942,7 +1942,7 @@ scroll_cursor_bot(min_scroll, set_topbot)
{ {
loff.lnum = curwin->w_topline; loff.lnum = curwin->w_topline;
topline_back(&loff); topline_back(&loff);
if (used + loff.height > curwin->w_height) if (loff.height == MAXCOL || used + loff.height > curwin->w_height)
break; break;
used += loff.height; used += loff.height;
#ifdef FEAT_DIFF #ifdef FEAT_DIFF
@@ -2021,7 +2021,10 @@ scroll_cursor_bot(min_scroll, set_topbot)
/* Add one line above */ /* Add one line above */
topline_back(&loff); topline_back(&loff);
used += loff.height; if (loff.height == MAXCOL)
used = MAXCOL;
else
used += loff.height;
if (used > curwin->w_height) if (used > curwin->w_height)
break; break;
if (loff.lnum >= curwin->w_botline if (loff.lnum >= curwin->w_botline
@@ -2175,7 +2178,10 @@ scroll_cursor_halfway(atend)
if (below > above) /* add a line above the cursor */ if (below > above) /* add a line above the cursor */
{ {
topline_back(&loff); topline_back(&loff);
used += loff.height; if (loff.height == MAXCOL)
used = MAXCOL;
else
used += loff.height;
if (used > curwin->w_height) if (used > curwin->w_height)
break; break;
above += loff.height; above += loff.height;
@@ -2472,9 +2478,12 @@ onepage(dir, count)
while (n <= curwin->w_height && loff.lnum >= 1) while (n <= curwin->w_height && loff.lnum >= 1)
{ {
topline_back(&loff); topline_back(&loff);
n += loff.height; if (loff.height == MAXCOL)
n = MAXCOL;
else
n += loff.height;
} }
if (n <= curwin->w_height) /* at begin of file */ if (loff.lnum < 1) /* at begin of file */
{ {
curwin->w_topline = 1; curwin->w_topline = 1;
#ifdef FEAT_DIFF #ifdef FEAT_DIFF

2
src/version.c
View File

@@ -681,6 +681,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 */
/**/
366,
/**/ /**/
365, 365,
/**/ /**/