From: tomo <tomo>
Date: Mon, 2 Feb 2004 17:37:16 +0000 (+0000)
Subject: (COMPOSE_ADD_CHAR): Use `Fchar_feature' instead of
X-Git-Tag: r21-4-14-chise-0_21-23^2~103
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=9c17fac5f6e5110707c88aa3e5ca7b1b1a0a21d0;p=chise%2Fxemacs-chise.git.1

(COMPOSE_ADD_CHAR): Use `Fchar_feature' instead of
`Fget_char_attribute'.
(char_encode_utf8): Likewise.
---

diff --git a/src/text-coding.c b/src/text-coding.c
index 970a7bf..d8322a0 100644
--- a/src/text-coding.c
+++ b/src/text-coding.c
@@ -1,7 +1,7 @@
 /* Code conversion functions.
    Copyright (C) 1991, 1995 Free Software Foundation, Inc.
    Copyright (C) 1995 Sun Microsystems, Inc.
-   Copyright (C) 1999,2000,2001,2002,2003 MORIOKA Tomohiko
+   Copyright (C) 1999,2000,2001,2002,2003,2004 MORIOKA Tomohiko
 
 This file is part of XEmacs.
 
@@ -3474,7 +3474,8 @@ COMPOSE_ADD_CHAR (struct decoding_stream *str,
   else if (!CONSP (str->combining_table))
     {
       Lisp_Object ret
-	= Fget_char_attribute (make_char (character), Qcomposition, Qnil);
+	= Fchar_feature (make_char (character), Qcomposition, Qnil,
+			 Qnil, Qnil);
 
       if (NILP (ret))
 	decode_add_er_char (str, character, dst);
@@ -3493,7 +3494,8 @@ COMPOSE_ADD_CHAR (struct decoding_stream *str,
       if (CHARP (ret))
 	{
 	  Emchar char2 = XCHARVAL (ret);
-	  Lisp_Object ret2 = Fget_char_attribute (ret, Qcomposition, Qnil);
+	  Lisp_Object ret2 = Fchar_feature (ret, Qcomposition, Qnil,
+					    Qnil, Qnil);
 
 	  if (NILP (ret2))
 	    {
@@ -3510,8 +3512,8 @@ COMPOSE_ADD_CHAR (struct decoding_stream *str,
 	}
       else
 	{
-	  ret = Fget_char_attribute (make_char (character), Qcomposition,
-				     Qnil);
+	  ret = Fchar_feature (make_char (character), Qcomposition, Qnil,
+			       Qnil, Qnil);
 
 	  COMPOSE_FLUSH_CHARS (str, dst);
 	  if (NILP (ret))
@@ -4607,14 +4609,16 @@ char_encode_utf8 (struct encoding_stream *str, Emchar ch,
 	  Lisp_Object ret;
 
 	  if ( !NILP (map)
-	       && INTP (ret = Fget_char_attribute (make_char (ch),
-						   map, Qnil)) )
+	       && INTP (ret = Fchar_feature (make_char (ch),
+					     map, Qnil,
+					     Qnil, Qnil)) )
 	    code_point = XINT (ret);
 	  else if ( !NILP (map =
 			   CODING_SYSTEM_ISO2022_INITIAL_CHARSET
 			   (str->codesys, 2))
-		    && INTP (ret = Fget_char_attribute (make_char (ch),
-							map, Qnil)) )
+		    && INTP (ret = Fchar_feature (make_char (ch),
+						  map, Qnil,
+						  Qnil, Qnil)) )
 	    code_point = XINT (ret);
 	  else if (CODING_SYSTEM_USE_ENTITY_REFERENCE (str->codesys))
 	    {