Fix computation of scroll-margin's character position in redisplay_window.

  src/xdisp.c (redisplay_window): Pass to move_it_vertically the margin in
 pixels, not in screen lines.

diff --git a/src/ChangeLog b/src/ChangeLog
index 936ec6a3a1fe4086b58dca55ac20df0ccd27128f..f0e4fa62175a0f899053dda468b2f08d68409ce9 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -4,6 +4,8 @@
        position past the first glyph_row that ends at ZV.  (Bug#10902)
        (redisplay_window, next_element_from_string): Fix typos in
        comments.
+       (redisplay_window): Pass to move_it_vertically the margin in
+       pixels, not in screen lines.
 
 2012-03-02  Glenn Morris  <rgm@gnu.org>
 

diff --git a/src/xdisp.c b/src/xdisp.c
index 810a75fec5d9633e194d2634f74990f5b1cd7318..62d0d187a19ed2256afb75553d0c6b895653d3dd 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -15611,7 +15611,7 @@ redisplay_window (Lisp_Object window, int just_this_one_p)
 
          SAVE_IT (it1, it, it1data);
          start_display (&it1, w, startp);
-         move_it_vertically (&it1, margin);
+         move_it_vertically (&it1, margin * FRAME_LINE_HEIGHT (f));
          margin_pos = IT_CHARPOS (it1);
          RESTORE_IT (&it, &it, it1data);
        }