3 files changed, 18 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bb13ef00f8a..f306e471c89 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,19 @@
+2002-06-12  Kenichi Handa  <handa@etl.go.jp>
+
+        * international/quail.el (quail-update-leim-list-file): Force
+        writing the file by iso-2022-7bit.
+
+        * international/titdic-cnv.el (miscdic-convert): Force writing the
+        file by iso-2022-7bit.
+
+        * international/mule.el (define-charset): Change the attribute
+        :parents to :subset or :superset.
+
+        * international/mule-conf.el: Adjusted for the change of
+        define-charset (:parent -> :subset or :superset).
+
+        * international/characters.el: Fix the last change.
+
 2002-06-11  Dave Love  <fx@gnu.org>
 
         * language/cyril-util.el (cyrillic-encode-koi8-r-char)
diff --git a/lisp/international/mule.el b/lisp/international/mule.el
index dd91e997783..391fb87eedb 100644
--- a/lisp/international/mule.el
+++ b/lisp/international/mule.el
@@ -49,7 +49,7 @@ Distribution date of this version of MULE (multilingual environment).")
   "Define NAME (symbol) as a charset with DOCSTRING.
 The remaining arguments must come in pairs ATTRIBUTE VALUE.  ATTRIBUTE
 may be any symbol.  The following have special meanings, and one of
-`:code-offset', `:map', `:parents' must be specified.
+`:code-offset', `:map', `:subset', `:superset' must be specified.
 
 `:short-name'
 
diff --git a/src/ChangeLog b/src/ChangeLog
index c72d4dd89b9..9e52d7fc38b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -36,6 +36,7 @@
         (encode_char): Adjusted for the change of
         Fdefine_charset_internal.
         (syms_of_charset): Likewise.
+        (Ffind_charset_string): Setup the vector `charsets' correctly.
 
         * chartab.c (sub_char_table_ref_and_range): New arg defalt.  Fix
         the previous change.