Fix encoding of characters when using GB18030 fonts

* lisp/international/fontset.el (font-encoding-alist): Fix the
GB18030 entry to encode characters correctly when passing them to
the xfont back-end.  (Bug#31315)  See also
http://lists.gnu.org/archive/html/emacs-devel/2008-01/msg00754.html.

(cherry picked from commit bbe2cadc544e63e9378350621887f8fb9bbcc236)

diff --git a/lisp/international/fontset.el b/lisp/international/fontset.el
index 6f91207451705aa259dc5c9d2184800fad6029e8..5c0189b01555944c5a90deeff439171bb568d2a2 100644 (file)
--- a/lisp/international/fontset.el
+++ b/lisp/international/fontset.el
@@ -53,7 +53,10 @@
        ("ascii-0$" . ascii)
        ("gb2312.1980" . chinese-gb2312)
        ("gbk" . chinese-gbk)
-       ("gb18030" . (unicode . nil))
+        ;; GB18030 needs the characters encoded by gb18030, but a
+        ;; gb18030 font doesn't necessarily support all of the GB18030
+        ;; characters.
+       ("gb18030" . (gb18030 . unicode))
        ("jisx0208.1978" . japanese-jisx0208-1978)
        ("jisx0208" . japanese-jisx0208)
        ("jisx0201" . jisx0201)