(Fchar_variants): Rename `Q_ucs_variants' to `Q_ucs_unified'.
(put_char_composition): Likewise.
(Fput_char_attribute): Likewise.
(syms_of_chartab): Rename `->ucs-variants' to `->ucs-unified'.
Lisp_Object Qcomposition;
Lisp_Object Q_decomposition;
Lisp_Object Qto_ucs;
Lisp_Object Qcomposition;
Lisp_Object Q_decomposition;
Lisp_Object Qto_ucs;
-Lisp_Object Q_ucs_variants;
+Lisp_Object Q_ucs_unified;
Lisp_Object Qcompat;
Lisp_Object Qisolated;
Lisp_Object Qinitial;
Lisp_Object Qcompat;
Lisp_Object Qisolated;
Lisp_Object Qinitial;
Lisp_Object ret;
CHECK_CHAR (character);
Lisp_Object ret;
CHECK_CHAR (character);
- ret = Fget_char_attribute (character, Q_ucs_variants, Qnil);
+ ret = Fget_char_attribute (character, Q_ucs_unified, Qnil);
if (CONSP (ret))
return Fcopy_list (ret);
else
if (CONSP (ret))
return Fcopy_list (ret);
else
{
Emchar c = XINT (v);
Lisp_Object ret
{
Emchar c = XINT (v);
Lisp_Object ret
- = Fget_char_attribute (make_char (c), Q_ucs_variants, Qnil);
+ = Fget_char_attribute (make_char (c), Q_ucs_unified, Qnil);
- Fput_char_attribute (make_char (c), Q_ucs_variants,
+ Fput_char_attribute (make_char (c), Q_ucs_unified,
Fcons (character, Qnil));
}
else if (NILP (Fmemq (character, ret)))
{
Fcons (character, Qnil));
}
else if (NILP (Fmemq (character, ret)))
{
- Fput_char_attribute (make_char (c), Q_ucs_variants,
+ Fput_char_attribute (make_char (c), Q_ucs_unified,
Fcons (character, ret));
}
}
Fcons (character, ret));
}
}
- ret = Fget_char_attribute (make_char (c), Q_ucs_variants, Qnil);
+ ret = Fget_char_attribute (make_char (c), Q_ucs_unified, Qnil);
- Fput_char_attribute (make_char (c), Q_ucs_variants,
+ Fput_char_attribute (make_char (c), Q_ucs_unified,
Fcons (character, Qnil));
}
else if (NILP (Fmemq (character, ret)))
{
Fcons (character, Qnil));
}
else if (NILP (Fmemq (character, ret)))
{
- Fput_char_attribute (make_char (c), Q_ucs_variants,
+ Fput_char_attribute (make_char (c), Q_ucs_unified,
Fcons (character, ret));
}
}
Fcons (character, ret));
}
}
defsymbol (&Qsystem_char_id, "system-char-id");
defsymbol (&Qto_ucs, "=>ucs");
defsymbol (&Qsystem_char_id, "system-char-id");
defsymbol (&Qto_ucs, "=>ucs");
- defsymbol (&Q_ucs_variants, "->ucs-variants");
+ defsymbol (&Q_ucs_unified, "->ucs-unified");
defsymbol (&Qcomposition, "composition");
defsymbol (&Q_decomposition, "->decomposition");
defsymbol (&Qcompat, "compat");
defsymbol (&Qcomposition, "composition");
defsymbol (&Q_decomposition, "->decomposition");
defsymbol (&Qcompat, "compat");