Use `=>ucs' instead of `->ucs'.

[chise/xemacs-chise.git] / src / mule-charset.c

diff --git a/src/mule-charset.c b/src/mule-charset.c
index 43e1e0f..c254ffe 100644 (file)
--- 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);
@@ -3163,7 +3170,7 @@ Make a character from CHARSET and code-point CODE.
   if (XCHARSET_GRAPHIC (charset) == 1)
     c &= 0x7F7F7F7F;
   c = DECODE_CHAR (charset, c);
-  return c ? make_char (c) : Qnil;
+  return c >= 0 ? make_char (c) : Qnil;
 }
 
 DEFUN ("decode-builtin-char", Fdecode_builtin_char, 2, 2, 0, /*
@@ -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");