*** empty log message ***

diff --git a/etc/ChangeLog b/etc/ChangeLog
index b9e3b17..222d02b 100644 (file)
--- 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 3fe01c5..dab6666 100644 (file)
--- 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 4953bbf..dbc79a9 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+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.
@@ -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.