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

[Stefan Monnier]

Index: emacs/src/xdisp.c
diff -c emacs/src/xdisp.c:1.934 emacs/src/xdisp.c:1.935
*** emacs/src/xdisp.c:1.934     Tue Nov 16 00:28:57 2004
--- emacs/src/xdisp.c   Tue Nov 16 15:41:41 2004
***************
*** 1789,1795 ****
  
        /* 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);
      }
  
--- 1789,1796 ----
  
        /* If drawing a tool-bar window, draw it over the internal border
         at the top of the window.  */
!       if (WINDOWP (s->f->tool_bar_window)
!         && s->w == XWINDOW (s->f->tool_bar_window))
        r.y -= FRAME_INTERNAL_BORDER_WIDTH (s->f);
      }
  
***************
*** 17294,17300 ****
    s->y = WINDOW_TO_FRAME_PIXEL_Y (w, row->y);
  
    /* Display the internal border below the tool-bar window.  */
!   if (s->w == XWINDOW (s->f->tool_bar_window))
      s->y -= FRAME_INTERNAL_BORDER_WIDTH (s->f);
  
    s->ybase = s->y + row->ascent;
--- 17295,17302 ----
    s->y = WINDOW_TO_FRAME_PIXEL_Y (w, row->y);
  
    /* Display the internal border below the tool-bar window.  */
!   if (WINDOWP (s->f->tool_bar_window)
!       && s->w == XWINDOW (s->f->tool_bar_window))
      s->y -= FRAME_INTERNAL_BORDER_WIDTH (s->f);
  
    s->ybase = s->y + row->ascent;