aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2011-07-07 18:39:23 +0300
committerEli Zaretskii2011-07-07 18:39:23 +0300
commita8815b00dc3ce6878008e5e711d5094461cb69a4 (patch)
tree53bcdda6081f4ab6f6e4fa0f870abce8c04bc5e5 /src
parent12b9eb35271db4602d6a5559a4554fdd68604b59 (diff)
downloademacs-a8815b00dc3ce6878008e5e711d5094461cb69a4.tar.gz
emacs-a8815b00dc3ce6878008e5e711d5094461cb69a4.zip
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.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/term.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 642445b2328..6485ed08027 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12011-07-07 Eli Zaretskii <eliz@gnu.org>
2
3 * term.c (produce_glyphs) <xassert>: Allow IT_GLYPHLESS in it->what.
4 (Bug#9015)
5
12011-07-07 Kenichi Handa <handa@m17n.org> 62011-07-07 Kenichi Handa <handa@m17n.org>
2 7
3 * character.h (unicode_category_t): New enum type. 8 * 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)
1546 /* Nothing but characters are supported on terminal frames. */ 1546 /* Nothing but characters are supported on terminal frames. */
1547 xassert (it->what == IT_CHARACTER 1547 xassert (it->what == IT_CHARACTER
1548 || it->what == IT_COMPOSITION 1548 || it->what == IT_COMPOSITION
1549 || it->what == IT_STRETCH); 1549 || it->what == IT_STRETCH
1550 || it->what == IT_GLYPHLESS);
1550 1551
1551 if (it->what == IT_STRETCH) 1552 if (it->what == IT_STRETCH)
1552 { 1553 {