diff --git a/src/ChangeLog.22 b/src/ChangeLog.22
index bf9805a3b24ecef90898be3014199f0cd4811627..80c453a5d8ac278f5c41b6c0d5b02021ea9da01c 100644
--- a/src/ChangeLog.22
+++ b/src/ChangeLog.22
@@ -1,3 +1,25 @@
+2003-10-06  Kenichi Handa  <handa@m17n.org>
+
+	* charset.h (charset_unicode): Extern it.
+
+	* charset.c (string_xstring_p): Check by (C >= 0x100).
+	(find_charsets_in_text): Format of the arc CHARSETS changed.  New
+	arg MULTIBYTE.
+	(Ffind_charset_region, Ffind_charset_string): Adjusted for the
+	change of find_charsets_in_text.
+	(Fsplit_char): Fix doc.  Never return unknown.
+
+	* chartab.c (char_table_translate): Use CHARACTERP, not INETEGERP.
+
+	* coding.c (Fdefine_coding_system_alias): Update
+	Vcoding_system_list.
+
+	* fontset.c (load_font_get_repertory): Pay attention to the case
+	that ENCODING of a font is specified by a char-table.
+
+	* xterm.c (x_get_font_repertory): Handle the case that the
+	encoding of font is other than Unicode.
+
 2003-10-02  Kenichi Handa  <handa@m17n.org>
 
 	* term.c (encode_terminal_code): Don't handle glyph-table.  Check
diff --git a/src/fontset.h b/src/fontset.h
index 5c70eddecdc7343dfe6af958caa3b804848040d7..0fe186d0ff78bc862236daa7786a61f5339d19db 100644
--- a/src/fontset.h
+++ b/src/fontset.h
@@ -43,7 +43,8 @@ struct font_info
   /* Full name of the font given by a window system.  */
   char *full_name;
 
-  /* Charset of characters displayed by the font.  */
+  /* Charset to encode a character code into a glyph code of the
+     font.  */
   int charset;
 
 #ifdef WINDOWSNT
diff --git a/src/lisp.h b/src/lisp.h
index 7bbe88bf67a5e0aa7661650f71eee77e62bf5d0b..feab2714aef6f5718cdc90f5fe5aded7b37173f1 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -697,9 +697,8 @@ struct Lisp_Vector
    ? XSUB_CHAR_TABLE (XCHAR_TABLE (CT)->ascii)->contents[IDX]		 \
    : char_table_ref ((CT), (IDX)))
 
-/* Almost equivalent to Faref (CT, IDX) with optimization for ASCII
-   and 8-bit Europeans characters.  However, if the result is nil,
-   return IDX.
+/* Almost equivalent to Faref (CT, IDX).  However, if the result is
+   not a character, return IDX.
 
    For these characters, do not check validity of CT
    and do not follow parent.  */