(U-00020018): Unify H2-C1A3.

[chise/xemacs-chise.git] / src / mule-charset.c

diff --git a/src/mule-charset.c b/src/mule-charset.c
index 88d129f..57b702b 100644 (file)
--- a/src/mule-charset.c
+++ b/src/mule-charset.c
@@ -104,6 +104,7 @@ Lisp_Object Vcharset_ideograph_gt_pj_8;
 Lisp_Object Vcharset_ideograph_gt_pj_9;
 Lisp_Object Vcharset_ideograph_gt_pj_10;
 Lisp_Object Vcharset_ideograph_gt_pj_11;
+Lisp_Object Vcharset_ideograph_daikanwa_2;
 Lisp_Object Vcharset_ideograph_daikanwa;
 Lisp_Object Vcharset_mojikyo;
 Lisp_Object Vcharset_mojikyo_2022_1;
@@ -283,7 +284,7 @@ decoding_table_put_char (Lisp_Object v, int dim, int byte_offset,
       if (dim > 0)
        {
          if (!VECTORP (nv))
-           nv = (XVECTOR_DATA(v)[i] = make_older_vector (ccs_len, Qnil));
+           nv = (XVECTOR_DATA(v)[i] = make_vector (ccs_len, Qnil));
          v = nv;
        }
       else
@@ -359,7 +360,7 @@ put_char_ccs_code_point (Lisp_Object character,
       else
        {
          XCHARSET_DECODING_TABLE (ccs)
-           = v = make_older_vector (ccs_len, Qnil);
+           = v = make_vector (ccs_len, Qnil);
        }
 
       decoding_table_put_char (v, dim, byte_offset, code_point, character);
@@ -461,6 +462,7 @@ Lisp_Object Qascii,
   Qideograph_hanziku_12,
   Qchina3_jef,
   Qideograph_cbeta,
+  Qideograph_daikanwa_2,
   Qideograph_daikanwa,
   Qideograph_gt,
   Qideograph_gt_pj_1,
@@ -841,7 +843,7 @@ mark_charset (Lisp_Object obj)
   mark_object (cs->registry);
   mark_object (cs->ccl_program);
 #ifdef UTF2000
-  /* mark_object (cs->decoding_table); */
+  mark_object (cs->decoding_table);
 #endif
   return cs->name;
 }
@@ -1946,8 +1948,6 @@ Set mapping-table of CHARSET to TABLE.
 
   if (NILP (table))
     {
-      if (VECTORP (CHARSET_DECODING_TABLE(cs)))
-       make_vector_newer (CHARSET_DECODING_TABLE(cs));
       CHARSET_DECODING_TABLE(cs) = Qnil;
       return table;
     }
@@ -2410,6 +2410,7 @@ syms_of_mule_charset (void)
   defsymbol (&Qideograph_gt_pj_9,      "ideograph-gt-pj-9");
   defsymbol (&Qideograph_gt_pj_10,     "ideograph-gt-pj-10");
   defsymbol (&Qideograph_gt_pj_11,     "ideograph-gt-pj-11");
+  defsymbol (&Qideograph_daikanwa_2,   "ideograph-daikanwa-2");
   defsymbol (&Qideograph_daikanwa,     "ideograph-daikanwa");
   defsymbol (&Qchinese_big5,           "chinese-big5");
   defsymbol (&Qchinese_big5_cdp,       "chinese-big5-cdp");
@@ -2952,9 +2953,19 @@ complex_vars_of_mule_charset (void)
   DEF_GT_PJ (10);
   DEF_GT_PJ (11);
 
+  staticpro (&Vcharset_ideograph_daikanwa_2);
+  Vcharset_ideograph_daikanwa_2 =
+    make_charset (LEADING_BYTE_DAIKANWA_2, Qideograph_daikanwa_2, 256, 2,
+                 2, 2, 0, CHARSET_LEFT_TO_RIGHT,
+                 build_string ("Daikanwa Rev."),
+                 build_string ("Morohashi's Daikanwa Rev."),
+                 build_string
+                 ("Daikanwa dictionary (revised version)"),
+                 build_string ("Daikanwa\\(\\.[0-9]+\\)?-2"),
+                 Qnil, 0, 0, 0, 0);
   staticpro (&Vcharset_ideograph_daikanwa);
   Vcharset_ideograph_daikanwa =
-    make_charset (LEADING_BYTE_DAIKANWA, Qideograph_daikanwa, 256, 2,
+    make_charset (LEADING_BYTE_DAIKANWA_3, Qideograph_daikanwa, 256, 2,
                  2, 2, 0, CHARSET_LEFT_TO_RIGHT,
                  build_string ("Daikanwa"),
                  build_string ("Morohashi's Daikanwa Rev.2"),