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

[Stefan Monnier]

Index: emacs/src/dispnew.c
diff -c emacs/src/dispnew.c:1.355 emacs/src/dispnew.c:1.356
*** emacs/src/dispnew.c:1.355   Wed Aug 17 15:00:14 2005
--- emacs/src/dispnew.c Thu Sep  1 14:16:19 2005
***************
*** 3324,3332 ****
       struct window *w;
       int hpos;
  {
!   struct frame *f = XFRAME (w->frame);
! 
!   xassert (!FRAME_WINDOW_P (f));
    hpos += WINDOW_LEFT_EDGE_COL (w);
    return hpos;
  }
--- 3324,3330 ----
       struct window *w;
       int hpos;
  {
!   xassert (!FRAME_WINDOW_P (XFRAME (w->frame)));
    hpos += WINDOW_LEFT_EDGE_COL (w);
    return hpos;
  }
***************
*** 4101,4110 ****
    extern int input_pending;
    extern Lisp_Object do_mouse_tracking;
  #if GLYPH_DEBUG
-   struct frame *f = XFRAME (WINDOW_FRAME (w));
- 
    /* Check that W's frame doesn't have glyph matrices.  */
!   xassert (FRAME_WINDOW_P (f));
    xassert (updating_frame != NULL);
  #endif
  
--- 4099,4106 ----
    extern int input_pending;
    extern Lisp_Object do_mouse_tracking;
  #if GLYPH_DEBUG
    /* Check that W's frame doesn't have glyph matrices.  */
!   xassert (FRAME_WINDOW_P (XFRAME (WINDOW_FRAME (w))));
    xassert (updating_frame != NULL);
  #endif