Fix off-by-one in scroll down aggressively.

src/xdisp.c (try_scrolling): When scrolling down aggressively,
 scroll one screen line less, to make sure we end up at the margin
 for fractions close to 1.
This commit is contained in:
Eli Zaretskii 2011-03-29 21:58:13 +02:00
parent 9f3842cef7
commit 492001e973
2 changed files with 8 additions and 1 deletions

View file

@ -1,3 +1,9 @@
2011-03-29 Eli Zaretskii <eliz@gnu.org>
* xdisp.c (try_scrolling): When scrolling down aggressively,
scroll one screen line less, to make sure we end up at the margin
for fractions close to 1.
2011-03-28 Eli Zaretskii <eliz@gnu.org>
* xdisp.c (try_scrolling): When point is above the window, allow

View file

@ -13212,7 +13212,8 @@ try_scrolling (Lisp_Object window, int just_this_one_p,
amount_to_scroll = float_amount;
if (amount_to_scroll == 0 && float_amount > 0)
amount_to_scroll = 1;
amount_to_scroll -= this_scroll_margin - dy;
amount_to_scroll -=
this_scroll_margin - dy - FRAME_LINE_HEIGHT (f);
/* Don't let point enter the scroll margin near
bottom of the window. */
if (amount_to_scroll > height - 2*this_scroll_margin + dy)