Use utf-8-mcs-er instead of utf-8-mcs.

[chise/xemacs-chise.git-] / src / chartab.c

diff --git a/src/chartab.c b/src/chartab.c
index e6daf37..340530e 100644 (file)
--- a/src/chartab.c
+++ b/src/chartab.c
@@ -1073,6 +1073,7 @@ Lisp_Object Qsystem_char_id;
 Lisp_Object Qcomposition;
 Lisp_Object Q_decomposition;
 Lisp_Object Qto_ucs;
+Lisp_Object Q_ucs;
 Lisp_Object Q_ucs_variants;
 Lisp_Object Qcompat;
 Lisp_Object Qisolated;
@@ -1966,10 +1967,8 @@ decode_char_table_range (Lisp_Object range, struct chartab_range *outrange)
 {
   if (EQ (range, Qt))
     outrange->type = CHARTAB_RANGE_ALL;
-#ifdef UTF2000
   else if (EQ (range, Qnil))
     outrange->type = CHARTAB_RANGE_DEFAULT;
-#endif
   else if (CHAR_OR_CHAR_INTP (range))
     {
       outrange->type = CHARTAB_RANGE_CHAR;
@@ -3243,7 +3242,7 @@ Store CHARACTER's ATTRIBUTE with VALUE.
     }
   else if (EQ (attribute, Q_decomposition))
     put_char_composition (character, value);
-  else if (EQ (attribute, Qto_ucs))
+  else if (EQ (attribute, Qto_ucs) || EQ (attribute, Q_ucs))
     {
       Lisp_Object ret;
       Emchar c;
@@ -3264,6 +3263,10 @@ Store CHARACTER's ATTRIBUTE with VALUE.
          Fput_char_attribute (make_char (c), Q_ucs_variants,
                               Fcons (character, ret));
        }
+#if 0
+      if (EQ (attribute, Q_ucs))
+       attribute = Qto_ucs;
+#endif
     }
 #if 0
   else if (EQ (attribute, Qideographic_structure))
@@ -3674,7 +3677,9 @@ Store character's ATTRIBUTES.
            }
          rest = Fcdr (rest);
        }
-      if ( (!NILP (code = Fcdr (Fassq (Qto_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);
@@ -3729,7 +3734,8 @@ Retrieve the character of the given ATTRIBUTES.
        }
       rest = Fcdr (rest);
     }
-  if ( (!NILP (code = Fcdr (Fassq (Qto_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);
@@ -4084,6 +4090,7 @@ syms_of_chartab (void)
   defsymbol (&Qsystem_char_id,         "system-char-id");
 
   defsymbol (&Qto_ucs,                 "=>ucs");
+  defsymbol (&Q_ucs,                   "->ucs");
   defsymbol (&Q_ucs_variants,          "->ucs-variants");
   defsymbol (&Qcomposition,            "composition");
   defsymbol (&Q_decomposition,         "->decomposition");