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.

2 files changed, 3 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 936ec6a3a1f..f0e4fa62175 100644
--- 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 810a75fec5d..62d0d187a19 100644
--- 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);
         }