From: tomo <tomo>
Date: Tue, 2 Nov 2004 15:04:55 +0000 (+0000)
Subject: (char-variants): Refer `->subsumptive', `->denotational' and
X-Git-Tag: r21-4-15-u2km-0_21-32-a~2^2~108
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=42930f716b22fbd810b61332fd936cffde47de5d;p=chise%2Fxemacs-chise.git-

(char-variants): Refer `->subsumptive', `->denotational' and
`->identical' as same as `->ucs-unified'.
---

diff --git a/src/chartab.c b/src/chartab.c
index 15acf41..33f1ee2 100644
--- a/src/chartab.c
+++ b/src/chartab.c
@@ -1235,15 +1235,16 @@ Return variants of CHARACTER.
 */
        (character))
 {
-  Lisp_Object ret;
-
   CHECK_CHAR (character);
-  ret = Fchar_feature (character, Q_ucs_unified, Qnil,
-		       Qnil, Qnil);
-  if (CONSP (ret))
-    return Fcopy_list (ret);
-  else
-    return Qnil;
+  return
+    nconc2
+    (Fcopy_list (Fget_char_attribute (character, Q_subsumptive, Qnil)),
+     (nconc2
+      (Fcopy_list (Fget_char_attribute (character, Q_denotational, Qnil)),
+       (nconc2
+	(Fcopy_list (Fget_char_attribute (character, Q_identical, Qnil)),
+	 Fcopy_list (Fchar_feature (character, Q_ucs_unified, Qnil,
+				    Qnil, Qnil)))))));
 }
 
 #endif