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.

diff --git a/src/ChangeLog b/src/ChangeLog
index cb9096a5a5c3a63e5b4265536f0447082dbc2a16..dda98bc73a739153c3561bca5f45b1e5ab880836 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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

diff --git a/src/xdisp.c b/src/xdisp.c
index 871d070ed318bdb2524457154ad35e667c2596cf..7983c11813484f2ea48b09aca1b4fb6b74c37094 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -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)