diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2011-07-07 18:39:23 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2011-07-07 18:39:23 +0300 |
| commit | a8815b00dc3ce6878008e5e711d5094461cb69a4 (patch) | |
| tree | 53bcdda6081f4ab6f6e4fa0f870abce8c04bc5e5 /src | |
| parent | 12b9eb35271db4602d6a5559a4554fdd68604b59 (diff) | |
| download | emacs-a8815b00dc3ce6878008e5e711d5094461cb69a4.tar.gz | |
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/ChangeLog | 5 | ||||
| -rw-r--r-- | src/term.c | 3 |
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 @@ +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) { |