(Fstring_to_number): Don't recognize floating point if base is not 10.

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

diff --git a/src/mule-charset.c b/src/mule-charset.c
index 93e2054..0d6237b 100644 (file)
--- a/src/mule-charset.c
+++ b/src/mule-charset.c
@@ -387,9 +387,11 @@ Lisp_Object Q_decomposition;
 Lisp_Object Q_ucs;
 Lisp_Object Qcompat;
 Lisp_Object QnoBreak;
+Lisp_Object Qfraction;
 Lisp_Object Qsuper;
 Lisp_Object Qsub;
-Lisp_Object Qfraction;
+Lisp_Object Qcircle;
+Lisp_Object Qsquare;
 Lisp_Object Qwide;
 Lisp_Object Qnarrow;
 Lisp_Object Qfont;
@@ -405,18 +407,22 @@ to_char_code (Lisp_Object v, char* err_msg, Lisp_Object err_arg)
     return -1;
   else if (EQ (v, QnoBreak))
     return -2;
-  else if (EQ (v, Qsuper))
+  else if (EQ (v, Qfraction))
     return -3;
-  else if (EQ (v, Qsub))
+  else if (EQ (v, Qsuper))
     return -4;
-  else if (EQ (v, Qfraction))
+  else if (EQ (v, Qsub))
     return -5;
-  else if (EQ (v, Qwide))
+  else if (EQ (v, Qcircle))
     return -6;
-  else if (EQ (v, Qnarrow))
+  else if (EQ (v, Qsquare))
     return -7;
-  else if (EQ (v, Qfont))
+  else if (EQ (v, Qwide))
     return -8;
+  else if (EQ (v, Qnarrow))
+    return -9;
+  else if (EQ (v, Qfont))
+    return -10;
   else 
     signal_simple_error (err_msg, err_arg);
 }
@@ -523,6 +529,7 @@ Store CHARACTER's ATTRIBUTE with VALUE.
 {
   Lisp_Object ccs;
 
+  CHECK_CHAR (character);
   ccs = Ffind_charset (attribute);
   if (!NILP (ccs))
     {
@@ -2511,9 +2518,11 @@ syms_of_mule_charset (void)
   defsymbol (&Q_decomposition,         "->decomposition");
   defsymbol (&Qcompat,                 "compat");
   defsymbol (&QnoBreak,                        "noBreak");
+  defsymbol (&Qfraction,               "fraction");
   defsymbol (&Qsuper,                  "super");
   defsymbol (&Qsub,                    "sub");
-  defsymbol (&Qfraction,               "fraction");
+  defsymbol (&Qcircle,                 "circle");
+  defsymbol (&Qsquare,                 "square");
   defsymbol (&Qwide,                   "wide");
   defsymbol (&Qnarrow,                 "narrow");
   defsymbol (&Qfont,                   "font");