APPROVE COMMIT NOTE: This patch has been committed # HG changeset patch # User Aidan Kehoe <kehoea(a)parhasard.net&gt; # Date 1513978112 0 # Fri Dec 22 21:28:32 2017 +0000 # Node ID ee0c60ee6616be2b917712a649809b8f6e5e2d06 # Parent 46efc7173defd0f4f41bd8f3819970c4876c551a Don't crash in redisplay with Ethiopic and error-checking. src/ChangeLog addition: 2017-12-22 Aidan Kehoe <kehoea(a)parhasard.net&gt; * redisplay-x.c (separate_textual_runs_mule): The output of a charset's CCL program is just two octets, it is incorrect and buggy to transform it to an "external charset codepoint", something that will usually error in redisplay. Remove this unicode-internal change from Ben. diff -r 46efc7173def -r ee0c60ee6616 src/ChangeLog --- a/src/ChangeLog Fri Dec 22 12:48:38 2017 +0000 +++ b/src/ChangeLog Fri Dec 22 21:28:32 2017 +0000 ＠＠ -1,3 +1,11 ＠＠ +2017-12-22 Aidan Kehoe <kehoea(a)parhasard.net&gt; + + * redisplay-x.c (separate_textual_runs_mule): + The output of a charset's CCL program is just two octets, it is + incorrect and buggy to transform it to an "external charset + codepoint", something that will usually error in redisplay. Remove + this unicode-internal change from Ben. + 2017-12-20 Aidan Kehoe <kehoea(a)parhasard.net&gt; Use Lisp characters as the keysym for event objects reflecting diff -r 46efc7173def -r ee0c60ee6616 src/redisplay-x.c --- a/src/redisplay-x.c Fri Dec 22 12:48:38 2017 +0000 +++ b/src/redisplay-x.c Fri Dec 22 21:28:32 2017 +0000 ＠＠ -357,9 +357,6 ＠＠ ccl_driver (&char_converter, 0, buf, 0, 0, 0, CCL_MODE_ENCODING); byte1 = char_converter.reg[1]; byte2 = char_converter.reg[2]; - get_external_charset_codepoint (charset, make_fixnum (byte1), - make_fixnum (byte2), - &byte1, &byte2, 1); } else if (EQ (charset, Vcharset_ascii) && byte2 != CANT_DISPLAY_CHAR) { -- ‘As I sat looking up at the Guinness ad, I could never figure out / How your man stayed up on the surfboard after forty pints of stout’ (C. Moore)