Fix a gratuitous crash in emacs -nw with iso-safe terminal encoding.

src/term.c (produce_glyphs): Add IT_GLYPHLESS to the values of
 it->what accepted by the xassert.  Fixes a gratuitous crash in an
 Emacs built with -DXASSERTS.
This commit is contained in:
Eli Zaretskii 2011-06-18 17:33:14 +03:00
parent cc7245e4b5
commit ca3122a07a
2 changed files with 5 additions and 0 deletions

View file

@ -1,5 +1,9 @@
2011-06-18 Eli Zaretskii <eliz@gnu.org>
* term.c (produce_glyphs): Add IT_GLYPHLESS to the values of
it->what accepted by the xassert. Fixes a gratuitous crash in an
Emacs built with -DXASSERTS.
* .gdbinit (xvectype, xvector, xcompiled, xchartable, xboolvector)
(xpr, xfont, xbacktrace): Use "header.size" when accessing vectors
and vector-like objects.

View file

@ -1546,6 +1546,7 @@ produce_glyphs (struct it *it)
/* Nothing but characters are supported on terminal frames. */
xassert (it->what == IT_CHARACTER
|| it->what == IT_COMPOSITION
|| it->what == IT_GLYPHLESS
|| it->what == IT_STRETCH);
if (it->what == IT_STRETCH)