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

[Kim F. Storm]

Index: emacs/src/xdisp.c
diff -c emacs/src/xdisp.c:1.816 emacs/src/xdisp.c:1.817
*** emacs/src/xdisp.c:1.816     Fri Mar 21 09:23:32 2003
--- emacs/src/xdisp.c   Fri Mar 21 16:48:44 2003
***************
*** 1579,1585 ****
        /* If drawing a tool-bar window, draw it over the internal border
         at the top of the window.  */
        if (s->w == XWINDOW (s->f->tool_bar_window))
!       r.y -= s->f->output_data.x->internal_border_width;
      }
  
    r.y = WINDOW_TO_FRAME_PIXEL_Y (s->w, r.y);
--- 1579,1585 ----
        /* If drawing a tool-bar window, draw it over the internal border
         at the top of the window.  */
        if (s->w == XWINDOW (s->f->tool_bar_window))
!       r.y -= FRAME_INTERNAL_BORDER_WIDTH (s->f);
      }
  
    r.y = WINDOW_TO_FRAME_PIXEL_Y (s->w, r.y);
***************
*** 18920,18927 ****
        w->phys_cursor.vpos = vpos;
      }
  
!   rif->draw_window_cursor (w, glyph_row, on, x, y,
!                          new_cursor_type, new_cursor_width);
  }
  
  
--- 18920,18928 ----
        w->phys_cursor.vpos = vpos;
      }
  
!   rif->draw_window_cursor (w, glyph_row, x, y,
!                          new_cursor_type, new_cursor_width,
!                          on, active_cursor);
  }