diff options
| author | Steven Tamm | 2005-02-03 07:05:35 +0000 |
|---|---|---|
| committer | Steven Tamm | 2005-02-03 07:05:35 +0000 |
| commit | 4a34b52963fb688604da46dc1d0c900d5d1f2dfa (patch) | |
| tree | 2f7024440b7d9486083b08dcdd43fde7bdd04c19 /src | |
| parent | 8dc22b869ee51262cdf08a4d92c7f79e19dc9e9c (diff) | |
| download | emacs-4a34b52963fb688604da46dc1d0c900d5d1f2dfa.tar.gz emacs-4a34b52963fb688604da46dc1d0c900d5d1f2dfa.zip | |
* dispnew.c (update_window): Fixing compile error due to
xassert being uncondition, but predicate is.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/dispnew.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 721c118467b..16b6256556c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2005-02-02 Steven Tamm <steventamm@mac.com> | ||
| 2 | |||
| 3 | * dispnew.c (update_window): Fixing compile error due to | ||
| 4 | GLYPH_DEBUG being undefined. | ||
| 5 | |||
| 1 | 2005-02-02 Miles Bader <miles@gnu.org> | 6 | 2005-02-02 Miles Bader <miles@gnu.org> |
| 2 | 7 | ||
| 3 | * dispextern.h (xassert): Enable unconditionally. | 8 | * 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) | |||
| 4065 | extern Lisp_Object do_mouse_tracking; | 4065 | extern Lisp_Object do_mouse_tracking; |
| 4066 | #if GLYPH_DEBUG | 4066 | #if GLYPH_DEBUG |
| 4067 | struct frame *f = XFRAME (WINDOW_FRAME (w)); | 4067 | struct frame *f = XFRAME (WINDOW_FRAME (w)); |
| 4068 | #endif | ||
| 4069 | 4068 | ||
| 4070 | /* Check that W's frame doesn't have glyph matrices. */ | 4069 | /* Check that W's frame doesn't have glyph matrices. */ |
| 4071 | xassert (FRAME_WINDOW_P (f)); | 4070 | xassert (FRAME_WINDOW_P (f)); |
| 4072 | xassert (updating_frame != NULL); | 4071 | xassert (updating_frame != NULL); |
| 4072 | #endif | ||
| 4073 | 4073 | ||
| 4074 | /* Check pending input the first time so that we can quickly return. */ | 4074 | /* Check pending input the first time so that we can quickly return. */ |
| 4075 | if (redisplay_dont_pause) | 4075 | if (redisplay_dont_pause) |