[Emacs-diffs] /srv/bzr/emacs/trunk r105017: Fix bug #9015 with a bogus crash with glyphless characters on a TTY.

[Eli Zaretskii]

------------------------------------------------------------
revno: 105017
fixes bug(s): http://debbugs.gnu.org/9015
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Thu 2011-07-07 18:39:23 +0300
message:
  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.
modified:
  src/ChangeLog
  src/term.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-07-07 04:20:12 +0000
+++ b/src/ChangeLog     2011-07-07 15:39:23 +0000
@@ -1,3 +1,8 @@
+2011-07-07  Eli Zaretskii  <address@hidden>
+
+       * term.c (produce_glyphs) <xassert>: Allow IT_GLYPHLESS in it->what.
+       (Bug#9015)
+
 2011-07-07  Kenichi Handa  <address@hidden>
 
        * character.h (unicode_category_t): New enum type.

=== modified file 'src/term.c'
--- a/src/term.c        2011-05-18 00:39:40 +0000
+++ b/src/term.c        2011-07-07 15:39:23 +0000
@@ -1546,7 +1546,8 @@
   /* 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)
     {