From: Steven Tamm Date: Thu, 3 Feb 2005 07:05:35 +0000 (+0000) Subject: * dispnew.c (update_window): Fixing compile error due to X-Git-Tag: ttn-vms-21-2-B4~2454 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4a34b52963fb688604da46dc1d0c900d5d1f2dfa;p=emacs.git * dispnew.c (update_window): Fixing compile error due to xassert being uncondition, but predicate is. --- diff --git a/src/ChangeLog b/src/ChangeLog index 721c118467b..16b6256556c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2005-02-02 Steven Tamm + + * dispnew.c (update_window): Fixing compile error due to + GLYPH_DEBUG being undefined. + 2005-02-02 Miles Bader * dispextern.h (xassert): Enable unconditionally. diff --git a/src/dispnew.c b/src/dispnew.c index 1c3c56de80b..b58d81fcba5 100644 --- a/src/dispnew.c +++ b/src/dispnew.c @@ -4065,11 +4065,11 @@ update_window (w, force_p) extern Lisp_Object do_mouse_tracking; #if GLYPH_DEBUG struct frame *f = XFRAME (WINDOW_FRAME (w)); -#endif /* Check that W's frame doesn't have glyph matrices. */ xassert (FRAME_WINDOW_P (f)); xassert (updating_frame != NULL); +#endif /* Check pending input the first time so that we can quickly return. */ if (redisplay_dont_pause)