From: Eli Zaretskii <eliz@gnu.org>
Date: Thu, 7 Jul 2011 15:39:23 +0000 (+0300)
Subject: Fix bug #9015 with a bogus crash with glyphless characters on a TTY.
X-Git-Tag: emacs-pretest-24.0.90~104^2~449
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a8815b00dc3ce6878008e5e711d5094461cb69a4;p=emacs.git

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 642445b2328..6485ed08027 100644
--- 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 9205719b5f4..be23e547514 100644
--- 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)
     {