From: tomo <tomo>
Date: Mon, 10 Dec 2001 06:50:09 +0000 (+0000)
Subject: (decoding_table_put_char): Use `make_vector' instead of
X-Git-Tag: r21-2-43-utf-2000-0_18-3~132
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=535f4852618a6214cd2c95c38990cf6b67bb4533;p=chise%2Fxemacs-chise.git-

(decoding_table_put_char): Use `make_vector' instead of
`make_older_vector'.
(put_char_ccs_code_point): Likewise.
(mark_charset): Mark `cs->decoding_table'.
(Fset_charset_mapping_table): Don't use `make_vector_newer'.
---

diff --git a/src/mule-charset.c b/src/mule-charset.c
index 3d9642a..57b702b 100644
--- a/src/mule-charset.c
+++ b/src/mule-charset.c
@@ -284,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
@@ -360,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);
@@ -843,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;
 }
@@ -1948,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;
     }