Commit 3e441275 authored by Eli Zaretskii's avatar Eli Zaretskii
Browse files

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.
parent 817e5c3d
......@@ -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>
......
......@@ -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);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment