2 files changed, 5 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index b560528a1d6..2ebd593d00e 100644
--- 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 c68228cc51a..ab0bc1a4277 100644
--- 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)