# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1164613193 0
# Node ID 5c03e223d11b0a02ad26f3ea7268cffad19c9050
# Parent  4bcfe4827e4568c76c60e324c82614d85f978ec5
*** empty log message ***

diff -r 4bcfe4827e45 -r 5c03e223d11b lisp/ChangeLog.unicode
--- a/lisp/ChangeLog.unicode	Mon Nov 27 07:39:29 2006 +0000
+++ b/lisp/ChangeLog.unicode	Mon Nov 27 07:39:53 2006 +0000
@@ -1,3 +1,22 @@
+2006-11-27  Zhang Wei  <id.brep@gmail.com>
+
+	* language/chinese.el ("Chinese-GBK"): Add tutorial.
+	("Chinese-GB18030"): Add sample-text and tutorial.
+
+	* international/fontset.el (font-encoding-alist): Add gb18030.
+	(setup-default-fontset): Likewise.
+	(x-pixel-size-width-font-regexp, vertical-centering-font-regexp):
+	Add gbk and gb18030.
+	(charset-script-alist): Likewise.
+
+	* international/characters.el: Put property
+	preferred-coding-system to gbk and gb18030.
+
+	* international/mule-cmds.el (locale-language-names): Add an entry
+	for "zh_CN.UTF-8" and change "chs" to "Chinese-GBK".
+
+	* faces.el (face-font-registry-alternatives): Add gb18030.
+
 2006-11-22  Vinicius Jose Latorre  <viniciusjl@ig.com.br>  (tiny change)
 
 	* ps-mule.el: Fix maintainer email.