APPROVE COMMIT
NOTE: This patch has been committed
# HG changeset patch
# User Aidan Kehoe <kehoea(a)parhasard.net>
# Date 1509922033 0
# Sun Nov 05 22:47:13 2017 +0000
# Node ID 92495f148d48c7e2fdfe53d7180fa14766e2afce
# Parent 51ad3b1a1b9288836a9efba679cc7141495c9e35
Remove the last of the unified Big5 charset from the C code.
src/ChangeLog addition:
2017-11-05 Aidan Kehoe <kehoea(a)parhasard.net>
* lisp.h:
* fontcolor-xlike-inc.c:
Remove the last references to the unified Vcharset_chinese_big5
charset, especially relevant with XFT. Thank you Stephen Turnbull
and Raymond Toy!
diff -r 51ad3b1a1b92 -r 92495f148d48 src/ChangeLog
--- a/src/ChangeLog Thu Nov 02 21:38:04 2017 +0000
+++ b/src/ChangeLog Sun Nov 05 22:47:13 2017 +0000
@@ -4,6 +4,14 @@
Revert part of 417c790fd731, have this function return a list,
never a cons. Thank you Raymond Toy!
+2017-11-05 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * lisp.h:
+ * fontcolor-xlike-inc.c:
+ Remove the last references to the unified Vcharset_chinese_big5
+ charset, especially relevant with XFT. Thank you Stephen Turnbull
+ and Raymond Toy!
+
2017-10-28 Aidan Kehoe <kehoea(a)parhasard.net>
* file-coding.c (handle_possible_error_octet):
diff -r 51ad3b1a1b92 -r 92495f148d48 src/fontcolor-xlike-inc.c
--- a/src/fontcolor-xlike-inc.c Thu Nov 02 21:38:04 2017 +0000
+++ b/src/fontcolor-xlike-inc.c Sun Nov 05 22:47:13 2017 +0000
@@ -389,13 +389,9 @@
{ &Vcharset_hebrew_iso8859_8, "Hebrew", "he" },
/* #### probably close enough for Ukraine? */
{ &Vcharset_cyrillic_iso8859_5, "Russian", "ru" },
-#ifdef UNICODE_INTERNAL
- { &Vcharset_chinese_big5, "traditional Chinese", "zh-tw" },
-#else
/* #### these probably are not quite right */
{ &Vcharset_chinese_big5_1, "traditional Chinese", "zh-tw"
},
{ &Vcharset_chinese_big5_2, "traditional Chinese", "zh-tw"
},
-#endif
{ NULL, NULL, NULL }
};
diff -r 51ad3b1a1b92 -r 92495f148d48 src/lisp.h
--- a/src/lisp.h Thu Nov 02 21:38:04 2017 +0000
+++ b/src/lisp.h Sun Nov 05 22:47:13 2017 +0000
@@ -5792,12 +5792,10 @@
extern Lisp_Object Vcharset_japanese_jisx0212;
extern Lisp_Object Vcharset_chinese_cns11643_1;
extern Lisp_Object Vcharset_chinese_cns11643_2;
-#ifdef UNICODE_INTERNAL
-extern Lisp_Object Vcharset_chinese_big5;
-extern Lisp_Object Vcharset_japanese_shift_jis;
-#else
extern Lisp_Object Vcharset_chinese_big5_1;
extern Lisp_Object Vcharset_chinese_big5_2;
+#ifdef UNICODE_INTERNAL
+extern Lisp_Object Vcharset_japanese_shift_jis;
#endif /* UNICODE_INTERNAL */
extern Lisp_Object Vcharset_composite;
#endif /* MULE */
--
‘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)