From: tomo <tomo>
Date: Fri, 30 Jul 2004 13:00:41 +0000 (+0000)
Subject: (put_char_composition): Use DECODE_CHAR to get character corresponding
X-Git-Tag: r21-4-15-chise-0_21-31^2~151
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=d672aa78d8c646e18baec0181a4504be949cb522;p=chise%2Fxemacs-chise.git

(put_char_composition): Use DECODE_CHAR to get character corresponding
with UCS code point.
(Fput_char_attribute): Likewise.
---

diff --git a/src/chartab.c b/src/chartab.c
index d955a1a..5eae4bd 100644
--- a/src/chartab.c
+++ b/src/chartab.c
@@ -3426,7 +3426,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 +3489,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);