APPROVE COMMIT NOTE: This patch has been committed. # HG changeset patch # User Aidan Kehoe <kehoea(a)parhasard.net&gt; # Date 1512593548 0 # Wed Dec 06 20:52:28 2017 +0000 # Node ID 0f7f0274157b50c71683368d0614b8912e2b70d7 # Parent 1f54a2879725779c7da8c8a3b22de821a595e049 Get X11 redisplay working again for the just-in-time Unicode characters. src/ChangeLog addition: 2017-12-06 Aidan Kehoe <kehoea(a)parhasard.net&gt; * unicode.c (allocate_jit_ucs_charset): Ben removed the ccl-encode-to-ucs-2 CCL program even from the non-unicode-internal build, and this meant that redisplay of the just-in-time characters failed on X11. Address this and simplify the code by leaving charset-registries as nil for the just in time charsets, meaning the second-stage code always gets invoked, and we don't need the CCL program. diff -r 1f54a2879725 -r 0f7f0274157b src/ChangeLog --- a/src/ChangeLog Sat Dec 02 08:28:51 2017 +0000 +++ b/src/ChangeLog Wed Dec 06 20:52:28 2017 +0000 ＠＠ -13,6 +13,16 ＠＠ If KEY is a cons, loop using EXTERNAL_LIST_LOOP_3(), giving us type and circularity checking. +2017-12-06 Aidan Kehoe <kehoea(a)parhasard.net&gt; + + * unicode.c (allocate_jit_ucs_charset): + Ben removed the ccl-encode-to-ucs-2 CCL program even from the + non-unicode-internal build, and this meant that redisplay of the + just-in-time characters failed on X11. + Address this and simplify the code by leaving charset-registries + as nil for the just in time charsets, meaning the second-stage + code always gets invoked, and we don't need the CCL program. + 2017-11-30 Aidan Kehoe <kehoea(a)parhasard.net&gt; * keymap.c (describe_command): diff -r 1f54a2879725 -r 0f7f0274157b src/unicode.c --- a/src/unicode.c Sat Dec 02 08:28:51 2017 +0000 +++ b/src/unicode.c Wed Dec 06 20:52:28 2017 +0000 ＠＠ -1301,17 +1301,17 ＠＠ sprintf (setname, "jit-ucs-charset-%d", number_of_jit_charsets); - Vcurrent_jit_charset = Fmake_charset - (intern (setname), Vcharset_descr, - nconc2 (list6 (Qcolumns, Qone, Qchars, - make_fixnum (96), - Qdimension, make_fixnum (2)), - list4 (Qregistries, Qunicode_registries, - /* not allowed to set non-nil tags when not yet - initialized, for bootstrapping reasons; these - get set in mule-charset.el */ - Qtags, initialized ? list2 (intern ("jit"), Qinternal) - : Qnil))); + Vcurrent_jit_charset + = Fmake_charset (intern (setname), Vcharset_descr, + listu (Qcolumns, Qone, Qchars, make_fixnum (96), + Qdimension, make_fixnum (2), + /* not allowed to set non-nil tags when not yet + initialized, for bootstrapping reasons; these + get set in mule-charset.el */ + Qtags, initialized ? list2 (intern ("jit"), + Qinternal) : Qnil, + Qunbound)); + XCHARSET (Vcurrent_jit_charset)->jit_charset_p = 1; last_allocated_jit_c1 = last_allocated_jit_c2 = 32; -- ‘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)