3 files changed, 28 insertions, 0 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index b9e3b170d84..222d02b0384 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,13 @@
+2002-05-07  Kenichi Handa  <handa@etl.go.jp>
+
+        * charsets/Makefile (MAPS): Add gbk.map and gb18030-bmp.map.
+        (ICUDIR): New macro.
+        (gbk.map, gb18030-bmp.map): New targets.
+
+        * charsets/gbk.map, charsets/gb18030-bmp.map: New files.
+
+        * charsets/gbk18030.awk: New file.
+
 2002-03-01  Kenichi Handa  <handa@etl.go.jp>
 
         * charsets: New directory for charset mapping tables.
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3fe01c53d0b..dab6666f8e6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,15 @@
+2002-05-07  Kenichi Handa  <handa@etl.go.jp>
+
+        * international/fontset.el: Change the registry for
+        chinese-gb2312 and add the registry for chinese-gbk.
+
+        * international/mule.el (charset-chars): Fix typo.
+
+        * international/mule-conf.el (chinese-gbk): New charset.
+
+        * international/titdic-cnv.el (titdic-convert): Read into a
+        unibyte buffer then make the buffer multibyte.
+
 2002-03-07  Kenichi Handa  <handa@etl.go.jp>
 
         * international/mule-conf.el (utf-16-le): Use :bom attribute
diff --git a/src/ChangeLog b/src/ChangeLog
index 4953bbf2d62..dbc79a90274 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,10 @@
 2002-05-07  Kenichi Handa  <handa@etl.go.jp>
 
+        * xdisp.c (display_mode_element): When the variable `elt' is
+        changed, update `this' and `lisp_string'.
+
+2002-05-07  Kenichi Handa  <handa@etl.go.jp>
+
         * buffer.c (Fset_buffer_multibyte): Fix 8-bit char handling.
 
         * callproc.c (Fcall_process): Be sure to give the current buffer
@@ -55,6 +60,7 @@
         * coding.c (produce_chars): Set the variable `multibytep' correctly.
         (decode_coding_gap): Set coding->dst_multibyte correctly.
 
+>>>>>>> 1.2479.2.9
 2002-03-07  Kenichi Handa  <handa@etl.go.jp>
 
         * coding.c (encode_coding_utf_8): Initialize produced_chars to 0.