X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fchartab.c;h=02ef2df8a0ba5f1abf8807285f4e82b39366a51e;hb=32694402321fce2d34d01838861545f2943ffeca;hp=d955a1a128eb390b0862f107b6a88615db88b826;hpb=77c54524956a8f35710ffa721c0f30831d105dcc;p=chise%2Fxemacs-chise.git

diff --git a/src/chartab.c b/src/chartab.c
index d955a1a..02ef2df 100644
--- a/src/chartab.c
+++ b/src/chartab.c
@@ -76,7 +76,6 @@ EXFUN (Fchar_refs_simplify_char_specs, 1);
 extern Lisp_Object Qideographic_structure;
 
 Lisp_Object Vnext_defined_char_id;
-EXFUN (Fdefine_char, 1);
 
 EXFUN (Fmap_char_attribute, 3);
 
@@ -3426,7 +3425,7 @@ put_char_composition (Lisp_Object character, Lisp_Object value)
 
       if (INTP (v))
 	{
-	  Emchar c = XINT (v);
+	  Emchar c = DECODE_CHAR (Vcharset_ucs, XINT (v), 0);
 	  Lisp_Object ret
 	    = Fchar_feature (make_char (c), Q_ucs_unified, Qnil,
 			     Qnil, Qnil);
@@ -3489,7 +3488,7 @@ Store CHARACTER's ATTRIBUTE with VALUE.
       if (!INTP (value))
 	signal_simple_error ("Invalid value for =>ucs", value);
 
-      c = XINT (value);
+      c = DECODE_CHAR (Vcharset_ucs, XINT (value), 0);
 
       ret = Fchar_feature (make_char (c), Q_ucs_unified, Qnil,
 			   Qnil, Qnil);