aboutsummaryrefslogtreecommitdiffstats
path: root/src/term.c
diff options
context:
space:
mode:
authorDmitry Antipov2012-06-28 11:50:27 +0400
committerDmitry Antipov2012-06-28 11:50:27 +0400
commita54e2c050b9cf161cbccc3dd4628f8ef6b64f519 (patch)
tree447eb906b698dee37a17779ea15f448079b8f54b /src/term.c
parent1c9bd87017e4b5f7f56e734277ff6e0a0ebb51d6 (diff)
downloademacs-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/term.c')
-rw-r--r--src/term.c14
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)
1459 struct glyph *glyph, *end; 1459 struct glyph *glyph, *end;
1460 int i; 1460 int i;
1461 1461
1462 xassert (it->glyph_row); 1462 eassert (it->glyph_row);
1463 glyph = (it->glyph_row->glyphs[it->area] 1463 glyph = (it->glyph_row->glyphs[it->area]
1464 + it->glyph_row->used[it->area]); 1464 + it->glyph_row->used[it->area]);
1465 end = it->glyph_row->glyphs[1 + it->area]; 1465 end = it->glyph_row->glyphs[1 + it->area];
@@ -1546,7 +1546,7 @@ produce_glyphs (struct it *it)
1546 /* If a hook is installed, let it do the work. */ 1546 /* If a hook is installed, let it do the work. */
1547 1547
1548 /* Nothing but characters are supported on terminal frames. */ 1548 /* Nothing but characters are supported on terminal frames. */
1549 xassert (it->what == IT_CHARACTER 1549 eassert (it->what == IT_CHARACTER
1550 || it->what == IT_COMPOSITION 1550 || it->what == IT_COMPOSITION
1551 || it->what == IT_STRETCH 1551 || it->what == IT_STRETCH
1552 || it->what == IT_GLYPHLESS); 1552 || it->what == IT_GLYPHLESS);
@@ -1633,7 +1633,7 @@ produce_glyphs (struct it *it)
1633 { 1633 {
1634 Lisp_Object acronym = lookup_glyphless_char_display (-1, it); 1634 Lisp_Object acronym = lookup_glyphless_char_display (-1, it);
1635 1635
1636 xassert (it->what == IT_GLYPHLESS); 1636 eassert (it->what == IT_GLYPHLESS);
1637 produce_glyphless_glyph (it, 1, acronym); 1637 produce_glyphless_glyph (it, 1, acronym);
1638 } 1638 }
1639 } 1639 }
@@ -1657,7 +1657,7 @@ append_composite_glyph (struct it *it)
1657{ 1657{
1658 struct glyph *glyph; 1658 struct glyph *glyph;
1659 1659
1660 xassert (it->glyph_row); 1660 eassert (it->glyph_row);
1661 glyph = it->glyph_row->glyphs[it->area] + it->glyph_row->used[it->area]; 1661 glyph = it->glyph_row->glyphs[it->area] + it->glyph_row->used[it->area];
1662 if (glyph < it->glyph_row->glyphs[1 + it->area]) 1662 if (glyph < it->glyph_row->glyphs[1 + it->area])
1663 { 1663 {
@@ -1749,7 +1749,7 @@ append_glyphless_glyph (struct it *it, int face_id, const char *str)
1749 struct glyph *glyph, *end; 1749 struct glyph *glyph, *end;
1750 int i; 1750 int i;
1751 1751
1752 xassert (it->glyph_row); 1752 eassert (it->glyph_row);
1753 glyph = it->glyph_row->glyphs[it->area] + it->glyph_row->used[it->area]; 1753 glyph = it->glyph_row->glyphs[it->area] + it->glyph_row->used[it->area];
1754 end = it->glyph_row->glyphs[1 + it->area]; 1754 end = it->glyph_row->glyphs[1 + it->area];
1755 1755
@@ -1871,7 +1871,7 @@ produce_glyphless_glyph (struct it *it, int for_no_font, Lisp_Object acronym)
1871 } 1871 }
1872 else 1872 else
1873 { 1873 {
1874 xassert (it->glyphless_method == GLYPHLESS_DISPLAY_HEX_CODE); 1874 eassert (it->glyphless_method == GLYPHLESS_DISPLAY_HEX_CODE);
1875 len = (it->c < 0x10000 ? sprintf (buf, "\\u%04X", it->c) 1875 len = (it->c < 0x10000 ? sprintf (buf, "\\u%04X", it->c)
1876 : it->c <= MAX_UNICODE_CHAR ? sprintf (buf, "\\U%06X", it->c) 1876 : it->c <= MAX_UNICODE_CHAR ? sprintf (buf, "\\U%06X", it->c)
1877 : sprintf (buf, "\\x%06X", it->c)); 1877 : sprintf (buf, "\\x%06X", it->c));
@@ -2067,7 +2067,7 @@ turn_off_face (struct frame *f, int face_id)
2067 struct face *face = FACE_FROM_ID (f, face_id); 2067 struct face *face = FACE_FROM_ID (f, face_id);
2068 struct tty_display_info *tty = FRAME_TTY (f); 2068 struct tty_display_info *tty = FRAME_TTY (f);
2069 2069
2070 xassert (face != NULL); 2070 eassert (face != NULL);
2071 2071
2072 if (tty->TS_exit_attribute_mode) 2072 if (tty->TS_exit_attribute_mode)
2073 { 2073 {