From: tomo Date: Tue, 24 Jul 2001 04:25:21 +0000 (+0000) Subject: (Qto_ucs): New variable. X-Git-Tag: r21-2-38-utf-2000-0_17-1~254 X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=863313109e7d85e76d012bf62488b64c70b053ee;p=chise%2Fxemacs-chise.git.1 (Qto_ucs): New variable. (Fput_char_attribute): Treat `=>ucs' as same as `->ucs'. (Fdefine_char): Likewise. (syms_of_mule_charset): Add new symbol `=>ucs'. --- diff --git a/src/mule-charset.c b/src/mule-charset.c index 832911a..c254ffe 100644 --- a/src/mule-charset.c +++ b/src/mule-charset.c @@ -888,6 +888,7 @@ Lisp_Object Vcharacter_variant_table; Lisp_Object Qideograph_daikanwa; Lisp_Object Q_decomposition; Lisp_Object Qucs; +Lisp_Object Qto_ucs; Lisp_Object Q_ucs; Lisp_Object Qcompat; Lisp_Object Qisolated; @@ -1231,7 +1232,7 @@ Store CHARACTER's ATTRIBUTE with VALUE. } value = seq; } - else if (EQ (attribute, Q_ucs)) + else if (EQ (attribute, Qto_ucs) || EQ (attribute, Q_ucs)) { Lisp_Object ret; Emchar c; @@ -1247,6 +1248,10 @@ Store CHARACTER's ATTRIBUTE with VALUE. put_char_id_table (c, Fcons (character, ret), Vcharacter_variant_table); } +#if 0 + if (EQ (attribute, Q_ucs)) + attribute = Qto_ucs; +#endif } { Lisp_Object table = Fgethash (attribute, @@ -1526,7 +1531,9 @@ Store character's ATTRIBUTES. } rest = Fcdr (rest); } - if (!NILP (code = Fcdr (Fassq (Q_ucs, attributes)))) + if ( (!NILP (code = Fcdr (Fassq (Qto_ucs, attributes)))) || + (!NILP (code = Fcdr (Fassq (Q_ucs, attributes)))) ) + { if (!INTP (code)) signal_simple_error ("Invalid argument", attributes); @@ -3521,6 +3528,7 @@ syms_of_mule_charset (void) defsymbol (&Qchinese_cns11643_1, "chinese-cns11643-1"); defsymbol (&Qchinese_cns11643_2, "chinese-cns11643-2"); #ifdef UTF2000 + defsymbol (&Qto_ucs, "=>ucs"); defsymbol (&Q_ucs, "->ucs"); defsymbol (&Q_decomposition, "->decomposition"); defsymbol (&Qcompat, "compat");