Fix crash unicode_to_charset_codepoint_raw due to broken staticpro

Subject says it all. diff -r 75f4aa8ac131 src/ChangeLog --- a/src/ChangeLog Mon Sep 25 07:26:00 2017 +0100 +++ b/src/ChangeLog Fri Sep 29 15:39:25 2017 +0900 ＠＠ -1,3 +1,14 ＠＠ +2017-09-28 Stephen J. Turnbull <stephen(a)xemacs.org&gt; + + Fix crash in unicode_to_charset_codepoint_raw. + + * mule-coding.c (vars_of_mule_coding): + Fix broken staticpro of Vbig5_precedence (cause of crash). + + * unicode.c (vars_of_unicode): + Delete duplicated initialization of Vprecedence_array_cons_to_array. + (Defect, but probably harmless.) + 2017-09-25 Aidan Kehoe <kehoea(a)parhasard.net&gt; * data.c (Fchar_to_int): diff -r 75f4aa8ac131 src/mule-coding.c --- a/src/mule-coding.c Mon Sep 25 07:26:00 2017 +0100 +++ b/src/mule-coding.c Fri Sep 29 15:39:25 2017 +0900 ＠＠ -4169,7 +4169,7 ＠＠ staticpro (&Vshift_jis_precedence); Vbig5_precedence = Qnil; - staticpro (&Vshift_jis_precedence); + staticpro (&Vbig5_precedence); } void diff -r 75f4aa8ac131 src/unicode.c --- a/src/unicode.c Mon Sep 25 07:26:00 2017 +0100 +++ b/src/unicode.c Fri Sep 29 15:39:25 2017 +0900 ＠＠ -4000,15 +4000,12 ＠＠ Vprecedence_array_charsets_seen_hash = make_lisp_hash_table (20, HASH_TABLE_NON_WEAK, Qeq); - staticpro (&Vprecedence_array_charsets_seen_hash); - Vprecedence_array_charsets_seen_hash = - make_lisp_hash_table (20, HASH_TABLE_NON_WEAK, Qeq); - staticpro (&Vprecedence_list_to_array); Vprecedence_list_to_array = /* The entries are lists, but for speed in lookup, we only compare using `eq'. */ make_lisp_hash_table (20, HASH_TABLE_KEY_WEAK, Qeq); + staticpro (&Vprecedence_array_cons_to_array); Vprecedence_array_cons_to_array = /* We must compare with `equal' since we have conses. We make the table