diff options
| author | Dmitry Antipov <dmantipov@yandex.ru> | 2012-06-28 11:50:27 +0400 |
|---|---|---|
| committer | Dmitry Antipov <dmantipov@yandex.ru> | 2012-06-28 11:50:27 +0400 |
| commit | a54e2c050b9cf161cbccc3dd4628f8ef6b64f519 (patch) | |
| tree | 447eb906b698dee37a17779ea15f448079b8f54b /src/term.c | |
| parent | 1c9bd87017e4b5f7f56e734277ff6e0a0ebb51d6 (diff) | |
| download | emacs-a54e2c050b9cf161cbccc3dd4628f8ef6b64f519.tar.gz | |
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/term.c')
| -rw-r--r-- | src/term.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/term.c b/src/term.c index 471bc19ab54..128aaca20dd 100644 --- a/src/term.c +++ b/src/term.c @@ -1459,7 +1459,7 @@ append_glyph (struct it *it) struct glyph *glyph, *end; int i; - xassert (it->glyph_row); + eassert (it->glyph_row); glyph = (it->glyph_row->glyphs[it->area] + it->glyph_row->used[it->area]); end = it->glyph_row->glyphs[1 + it->area]; @@ -1546,7 +1546,7 @@ produce_glyphs (struct it *it) /* If a hook is installed, let it do the work. */ /* Nothing but characters are supported on terminal frames. */ - xassert (it->what == IT_CHARACTER + eassert (it->what == IT_CHARACTER || it->what == IT_COMPOSITION || it->what == IT_STRETCH || it->what == IT_GLYPHLESS); @@ -1633,7 +1633,7 @@ produce_glyphs (struct it *it) { Lisp_Object acronym = lookup_glyphless_char_display (-1, it); - xassert (it->what == IT_GLYPHLESS); + eassert (it->what == IT_GLYPHLESS); produce_glyphless_glyph (it, 1, acronym); } } @@ -1657,7 +1657,7 @@ append_composite_glyph (struct it *it) { struct glyph *glyph; - xassert (it->glyph_row); + eassert (it->glyph_row); glyph = it->glyph_row->glyphs[it->area] + it->glyph_row->used[it->area]; if (glyph < it->glyph_row->glyphs[1 + it->area]) { @@ -1749,7 +1749,7 @@ append_glyphless_glyph (struct it *it, int face_id, const char *str) struct glyph *glyph, *end; int i; - xassert (it->glyph_row); + eassert (it->glyph_row); glyph = it->glyph_row->glyphs[it->area] + it->glyph_row->used[it->area]; end = it->glyph_row->glyphs[1 + it->area]; @@ -1871,7 +1871,7 @@ produce_glyphless_glyph (struct it *it, int for_no_font, Lisp_Object acronym) } else { - xassert (it->glyphless_method == GLYPHLESS_DISPLAY_HEX_CODE); + eassert (it->glyphless_method == GLYPHLESS_DISPLAY_HEX_CODE); len = (it->c < 0x10000 ? sprintf (buf, "\\u%04X", it->c) : it->c <= MAX_UNICODE_CHAR ? sprintf (buf, "\\U%06X", it->c) : sprintf (buf, "\\x%06X", it->c)); @@ -2067,7 +2067,7 @@ turn_off_face (struct frame *f, int face_id) struct face *face = FACE_FROM_ID (f, face_id); struct tty_display_info *tty = FRAME_TTY (f); - xassert (face != NULL); + eassert (face != NULL); if (tty->TS_exit_attribute_mode) { |