forked from aniani/vim
patch 9.0.1664: divide by zero when scrolling with 'smoothscroll' set
Problem: Divide by zero when scrolling with 'smoothscroll' set. Solution: Avoid using a negative width. (closes #12540, closes #12528)
This commit is contained in:
committed by
Bram Moolenaar
parent
c9a4a8ab28
commit
8154e642aa
23
src/move.c
23
src/move.c
@@ -2591,17 +2591,20 @@ scroll_cursor_bot(int min_scroll, int set_topbot)
|
||||
(curwin, curwin->w_topline, FALSE);
|
||||
int skip_lines = 0;
|
||||
int width1 = curwin->w_width - curwin_col_off();
|
||||
int width2 = width1 + curwin_col_off2();
|
||||
// similar formula is used in curs_columns()
|
||||
if (curwin->w_skipcol > width1)
|
||||
skip_lines += (curwin->w_skipcol - width1) / width2 + 1;
|
||||
else if (curwin->w_skipcol > 0)
|
||||
skip_lines = 1;
|
||||
|
||||
top_plines -= skip_lines;
|
||||
if (top_plines > curwin->w_height)
|
||||
if (width1 > 0)
|
||||
{
|
||||
scrolled += (top_plines - curwin->w_height);
|
||||
int width2 = width1 + curwin_col_off2();
|
||||
// similar formula is used in curs_columns()
|
||||
if (curwin->w_skipcol > width1)
|
||||
skip_lines += (curwin->w_skipcol - width1) / width2 + 1;
|
||||
else if (curwin->w_skipcol > 0)
|
||||
skip_lines = 1;
|
||||
|
||||
top_plines -= skip_lines;
|
||||
if (top_plines > curwin->w_height)
|
||||
{
|
||||
scrolled += (top_plines - curwin->w_height);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user