X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Ftext-coding.c;h=e6da3718657d57ab1c8273cc1fd0e974caa8b2c7;hb=e3f96efe2240e0baef0631833e19c5d7372861dd;hp=e604800b3fcc3398e35e4799c8ea31cc0d8409c0;hpb=0807122bc4f4412f762f187e2fdac8c197928015;p=chise%2Fxemacs-chise.git.1

diff --git a/src/text-coding.c b/src/text-coding.c
index e604800..e6da371 100644
--- a/src/text-coding.c
+++ b/src/text-coding.c
@@ -3527,6 +3527,7 @@ COMPOSE_FLUSH_CHARS (struct decoding_stream *str, unsigned_char_dynarr* dst)
 
 extern CONCORD_DS concord_current_env;
 
+#if 0
 static int
 concord_setup_env_maybe ()
 {
@@ -3536,6 +3537,7 @@ concord_setup_env_maybe ()
     }
   return 0;
 }
+#endif
 
 void COMPOSE_ADD_CHAR (struct decoding_stream *str, Emchar character,
 		       unsigned_char_dynarr* dst);
@@ -3550,15 +3552,15 @@ COMPOSE_ADD_CHAR (struct decoding_stream *str,
     {
       COS_object ret;
 
-      concord_setup_env_maybe ();
-      ret = concord_object_get_feature_value (cos_make_char (character),
+      /* concord_setup_env_maybe (); */
+      open_chise_data_source_maybe ();
+      ret = concord_object_get_attribute (cos_make_char (character),
 					      COS_COMPOSITION);
 
       if (!cos_cons_p (ret))
 	decode_add_er_char (str, character, dst);
       else
 	{
-	  //cos_retain_object (ret);
 	  str->combined_chars[0] = character;
 	  str->combined_char_count = 1;
 	  str->combining_table = ret;
@@ -3570,14 +3572,14 @@ COMPOSE_ADD_CHAR (struct decoding_stream *str,
 	= cos_cdr (cos_assoc (cos_make_char (character),
 			      str->combining_table));
 
-      //cos_release_object (str->combining_table);
       if (cos_char_p (ret))
 	{
 	  Emchar char2 = cos_char_id (ret);
 	  COS_object ret2;
 
-	  concord_setup_env_maybe ();
-      	  ret2 = concord_object_get_feature_value (ret, COS_COMPOSITION);
+	  /* concord_setup_env_maybe (); */
+	  open_chise_data_source_maybe ();
+      	  ret2 = concord_object_get_attribute (ret, COS_COMPOSITION);
 
 	  if (!cos_cons_p (ret2))
 	    {
@@ -3587,7 +3589,6 @@ COMPOSE_ADD_CHAR (struct decoding_stream *str,
 	    }
 	  else
 	    {
-	      //cos_retain_object (ret2);
 	      str->combined_chars[0] = char2;
 	      str->combined_char_count = 1;
 	      str->combining_table = ret2;
@@ -3595,8 +3596,9 @@ COMPOSE_ADD_CHAR (struct decoding_stream *str,
 	}
       else
 	{
-	  concord_setup_env_maybe ();
-      	  ret = concord_object_get_feature_value (cos_make_char (character),
+	  /* concord_setup_env_maybe (); */
+	  open_chise_data_source_maybe ();
+      	  ret = concord_object_get_attribute (cos_make_char (character),
 						  COS_COMPOSITION);
 
 	  COMPOSE_FLUSH_CHARS (str, dst);
@@ -3604,7 +3606,6 @@ COMPOSE_ADD_CHAR (struct decoding_stream *str,
 	    decode_add_er_char (str, character, dst);
 	  else
 	    {
-	      //cos_retain_object (ret);
 	      str->combined_chars[0] = character;
 	      str->combined_char_count = 1;
 	      str->combining_table = ret;