Fix bug #9015 with a bogus crash with glyphless characters on a TTY.

 src/term.c (produce_glyphs) <xassert>: Allow IT_GLYPHLESS in it->what.

diff --git a/src/ChangeLog b/src/ChangeLog
index 642445b23286f64f2ed3b580c8aaf7f4ec44e0ad..6485ed0802793c1ebfdb631213f087f3d411352c 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-07  Eli Zaretskii  <eliz@gnu.org>
+
+       * term.c (produce_glyphs) <xassert>: Allow IT_GLYPHLESS in it->what.
+       (Bug#9015)
+
 2011-07-07  Kenichi Handa  <handa@m17n.org>
 
        * character.h (unicode_category_t): New enum type.

diff --git a/src/term.c b/src/term.c
index 9205719b5f4c3b198694bebf65a770202be5c7be..be23e547514e9a95e03461469137e775110a3806 100644 (file)
--- a/src/term.c
+++ b/src/term.c
@@ -1546,7 +1546,8 @@ 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_STRETCH);
+          || it->what == IT_STRETCH
+          || it->what == IT_GLYPHLESS);
 
   if (it->what == IT_STRETCH)
     {