diff options
| author | Dmitry Antipov | 2012-06-28 11:50:27 +0400 |
|---|---|---|
| committer | Dmitry Antipov | 2012-06-28 11:50:27 +0400 |
| commit | a54e2c050b9cf161cbccc3dd4628f8ef6b64f519 (patch) | |
| tree | 447eb906b698dee37a17779ea15f448079b8f54b /src/w32term.c | |
| parent | 1c9bd87017e4b5f7f56e734277ff6e0a0ebb51d6 (diff) | |
| download | emacs-a54e2c050b9cf161cbccc3dd4628f8ef6b64f519.tar.gz emacs-a54e2c050b9cf161cbccc3dd4628f8ef6b64f519.zip | |
Generalize run-time debugging checks.
* configure.in (ENABLE_CHECKING): Update comment.
* src/dispextern.h (XASSERTS): Remove.
* src/fontset.c (xassert): Remove.
Convert from xassert to eassert.
* src/alloc.c: Convert from xassert to eassert.
* src/bidi.c: Likewise.
* src/dispnew.c: Likewise.
* src/fns.c: Likewise.
* src/fringe.c: Likewise.
* src/ftfont.c: Likewise.
* src/gtkutil.c: Likewise.
* src/image.c: Likewise.
* src/keyboard.c: Likewise.
* src/menu.c: Likewise.
* src/process.c: Likewise.
* src/scroll.c: Likewise.
* src/sound.c: Likewise.
* src/term.c: Likewise.
* src/w32console.c: Likewise.
* src/w32fns.c: Likewise.
* src/w32term.c: Likewise.
* src/window.c: Likewise.
* src/xdisp.c: Likewise.
* src/xfaces.c: Likewise.
* src/xfns.c: Likewise.
* src/xselect.c: Likewise.
* src/xterm.c: Likewise.
Diffstat (limited to 'src/w32term.c')
| -rw-r--r-- | src/w32term.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/w32term.c b/src/w32term.c index 4f4fa220a7b..f879e648054 100644 --- a/src/w32term.c +++ b/src/w32term.c | |||
| @@ -742,7 +742,7 @@ x_after_update_window_line (struct glyph_row *desired_row) | |||
| 742 | struct frame *f; | 742 | struct frame *f; |
| 743 | int width, height; | 743 | int width, height; |
| 744 | 744 | ||
| 745 | xassert (w); | 745 | eassert (w); |
| 746 | 746 | ||
| 747 | if (!desired_row->mode_line_p && !w->pseudo_window_p) | 747 | if (!desired_row->mode_line_p && !w->pseudo_window_p) |
| 748 | desired_row->redraw_fringe_bitmaps_p = 1; | 748 | desired_row->redraw_fringe_bitmaps_p = 1; |
| @@ -1086,7 +1086,7 @@ x_set_mouse_face_gc (struct glyph_string *s) | |||
| 1086 | s->gc = FRAME_W32_DISPLAY_INFO (s->f)->scratch_cursor_gc; | 1086 | s->gc = FRAME_W32_DISPLAY_INFO (s->f)->scratch_cursor_gc; |
| 1087 | } | 1087 | } |
| 1088 | 1088 | ||
| 1089 | xassert (s->gc != 0); | 1089 | eassert (s->gc != 0); |
| 1090 | } | 1090 | } |
| 1091 | 1091 | ||
| 1092 | 1092 | ||
| @@ -1143,7 +1143,7 @@ x_set_glyph_string_gc (struct glyph_string *s) | |||
| 1143 | } | 1143 | } |
| 1144 | 1144 | ||
| 1145 | /* GC must have been set. */ | 1145 | /* GC must have been set. */ |
| 1146 | xassert (s->gc != 0); | 1146 | eassert (s->gc != 0); |
| 1147 | } | 1147 | } |
| 1148 | 1148 | ||
| 1149 | 1149 | ||
| @@ -1560,7 +1560,7 @@ w32_alloc_lighter_color (struct frame *f, COLORREF *color, | |||
| 1560 | delta /= 256; | 1560 | delta /= 256; |
| 1561 | 1561 | ||
| 1562 | /* Change RGB values by specified FACTOR. Avoid overflow! */ | 1562 | /* Change RGB values by specified FACTOR. Avoid overflow! */ |
| 1563 | xassert (factor >= 0); | 1563 | eassert (factor >= 0); |
| 1564 | new = PALETTERGB (min (0xff, factor * GetRValue (*color)), | 1564 | new = PALETTERGB (min (0xff, factor * GetRValue (*color)), |
| 1565 | min (0xff, factor * GetGValue (*color)), | 1565 | min (0xff, factor * GetGValue (*color)), |
| 1566 | min (0xff, factor * GetBValue (*color))); | 1566 | min (0xff, factor * GetBValue (*color))); |
| @@ -2237,7 +2237,7 @@ x_draw_image_glyph_string (struct glyph_string *s) | |||
| 2237 | static void | 2237 | static void |
| 2238 | x_draw_stretch_glyph_string (struct glyph_string *s) | 2238 | x_draw_stretch_glyph_string (struct glyph_string *s) |
| 2239 | { | 2239 | { |
| 2240 | xassert (s->first_glyph->type == STRETCH_GLYPH); | 2240 | eassert (s->first_glyph->type == STRETCH_GLYPH); |
| 2241 | 2241 | ||
| 2242 | if (s->hl == DRAW_CURSOR | 2242 | if (s->hl == DRAW_CURSOR |
| 2243 | && !x_stretch_cursor_p) | 2243 | && !x_stretch_cursor_p) |
| @@ -6032,9 +6032,9 @@ x_wm_set_icon_position (struct frame *f, int icon_x, int icon_y) | |||
| 6032 | static void | 6032 | static void |
| 6033 | x_check_font (struct frame *f, struct font *font) | 6033 | x_check_font (struct frame *f, struct font *font) |
| 6034 | { | 6034 | { |
| 6035 | xassert (font != NULL && ! NILP (font->props[FONT_TYPE_INDEX])); | 6035 | eassert (font != NULL && ! NILP (font->props[FONT_TYPE_INDEX])); |
| 6036 | if (font->driver->check) | 6036 | if (font->driver->check) |
| 6037 | xassert (font->driver->check (f, font) == 0); | 6037 | eassert (font->driver->check (f, font) == 0); |
| 6038 | } | 6038 | } |
| 6039 | 6039 | ||
| 6040 | #endif /* GLYPH_DEBUG != 0 */ | 6040 | #endif /* GLYPH_DEBUG != 0 */ |