[Emacs-diffs] Changes to emacs/src/xdisp.c

[Kim F . Storm]

Index: emacs/src/xdisp.c
diff -c emacs/src/xdisp.c:1.1046 emacs/src/xdisp.c:1.1047
*** emacs/src/xdisp.c:1.1046    Sun Sep  4 01:28:41 2005
--- emacs/src/xdisp.c   Wed Sep  7 08:46:04 2005
***************
*** 12830,12841 ****
    if (check_margins
        && !MINI_WINDOW_P (w))
      {
!       int this_scroll_margin, cursor_height;
  
        this_scroll_margin = max (0, scroll_margin);
        this_scroll_margin = min (this_scroll_margin, WINDOW_TOTAL_LINES (w) / 
4);
        this_scroll_margin *= FRAME_LINE_HEIGHT (it.f);
-       cursor_height = MATRIX_ROW (w->desired_matrix, w->cursor.vpos)->height;
  
        if ((w->cursor.y < this_scroll_margin
           && CHARPOS (pos) > BEGV)
--- 12830,12840 ----
    if (check_margins
        && !MINI_WINDOW_P (w))
      {
!       int this_scroll_margin;
  
        this_scroll_margin = max (0, scroll_margin);
        this_scroll_margin = min (this_scroll_margin, WINDOW_TOTAL_LINES (w) / 
4);
        this_scroll_margin *= FRAME_LINE_HEIGHT (it.f);
  
        if ((w->cursor.y < this_scroll_margin
           && CHARPOS (pos) > BEGV)