[Emacs-diffs] /srv/bzr/emacs/trunk r107484: Fix computation of scroll-margin's character position in redisplay_window.

[Eli Zaretskii]

------------------------------------------------------------
revno: 107484
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Fri 2012-03-02 17:40:44 +0200
message:
  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.
modified:
  src/ChangeLog
  src/xdisp.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-03-02 12:03:08 +0000
+++ b/src/ChangeLog     2012-03-02 15:40:44 +0000
@@ -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  <address@hidden>
 

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2012-03-02 12:03:08 +0000
+++ b/src/xdisp.c       2012-03-02 15:40:44 +0000
@@ -15611,7 +15611,7 @@
 
          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);
        }