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

[Kim F . Storm]

Index: emacs/src/xdisp.c
diff -c emacs/src/xdisp.c:1.968 emacs/src/xdisp.c:1.969
*** emacs/src/xdisp.c:1.968     Sat Jan 22 23:55:00 2005
--- emacs/src/xdisp.c   Sun Jan 23 00:50:52 2005
***************
*** 1292,1298 ****
    if (IT_CHARPOS (it) >= charpos)
      {
        int top_y = it.current_y;
!       int bottom_y = line_bottom_y (&it);
        int window_top_y = WINDOW_HEADER_LINE_HEIGHT (w);
  
        if (top_y < window_top_y)
--- 1292,1298 ----
    if (IT_CHARPOS (it) >= charpos)
      {
        int top_y = it.current_y;
!       int bottom_y = (last_height = 0, line_bottom_y (&it));
        int window_top_y = WINDOW_HEADER_LINE_HEIGHT (w);
  
        if (top_y < window_top_y)
***************
*** 1302,1308 ****
        if (visible_p && x)
        {
          *x = it.current_x;
!         *y = max (top_y + it.max_ascent - it.ascent, window_top_y);
          if (rtop)
            {
              *rtop = max (0, window_top_y - top_y);
--- 1302,1308 ----
        if (visible_p && x)
        {
          *x = it.current_x;
!         *y = max (top_y + max (0, it.max_ascent - it.ascent), window_top_y);
          if (rtop)
            {
              *rtop = max (0, window_top_y - top_y);