Sync up with r21-4-10-utf-2000-0_20-jis-x0213-2000.

diff --git a/src/ChangeLog b/src/ChangeLog
index 4c822bc..a8551a0 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2003-02-07  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+       * chartab.c (Fput_char_attribute): Canonicalise charset-aliases.
+
 2003-01-05  MORIOKA Tomohiko  <tomo@mousai.as.wakwak.ne.jp>
 
        * mule-charset.c (Vcharset_ideograph_cbeta): Deleted.

diff --git a/src/chartab.c b/src/chartab.c
index 6e12d84..2c8181a 100644 (file)
--- a/src/chartab.c
+++ b/src/chartab.c
@@ -2897,6 +2897,7 @@ Store CHARACTER's ATTRIBUTE with VALUE.
     {
       CHECK_CHAR (character);
       value = put_char_ccs_code_point (character, ccs, value);
+      attribute = XCHARSET_NAME (ccs);
     }
   else if (EQ (attribute, Q_decomposition))
     {