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.

diff --git a/src/ChangeLog b/src/ChangeLog
index b560528a1d660a99ae599b9f78d1882da90c81b6..2ebd593d00e8012689b1d97e47bd2239f928ea1f 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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.

diff --git a/src/term.c b/src/term.c
index c68228cc51aa29bf6353a4c6b1109f4cdd8cad68..ab0bc1a427716ee78c864a6de0d08669273efb12 100644 (file)
--- a/src/term.c
+++ b/src/term.c
@@ -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)