(Fdecode_char): Modify number of arguments of EXFUN setting.

[chise/xemacs-chise.git.1] / src / text-coding.c

diff --git a/src/text-coding.c b/src/text-coding.c
index 3808dde..6baefdd 100644 (file)
--- a/src/text-coding.c
+++ b/src/text-coding.c
@@ -1,7 +1,7 @@
 /* Code conversion functions.
    Copyright (C) 1991, 1995 Free Software Foundation, Inc.
    Copyright (C) 1995 Sun Microsystems, Inc.
-   Copyright (C) 1999,2000,2001,2002 MORIOKA Tomohiko
+   Copyright (C) 1999,2000,2001,2002,2003 MORIOKA Tomohiko
 
 This file is part of XEmacs.
 
@@ -3340,11 +3340,11 @@ decode_add_er_char (struct decoding_stream *str, Emchar c,
                                string, Qnil, Qnil)))
        {
          int code
-           = XINT (Fstring_to_number
-                   (Fsubstring (string,
-                                Fmatch_beginning (make_int (1)),
-                                Fmatch_end (make_int (1))),
-                    make_int (16)));
+           = XUINT (Fstring_to_number
+                    (Fsubstring (string,
+                                 Fmatch_beginning (make_int (1)),
+                                 Fmatch_end (make_int (1))),
+                     make_int (16)));
 
          DECODE_ADD_UCS_CHAR (code, dst);
        }
@@ -3493,11 +3493,11 @@ COMPOSE_ADD_CHAR (struct decoding_stream *str,
       if (CHARP (ret))
        {
          Emchar char2 = XCHARVAL (ret);
-         ret = Fget_char_attribute (make_char (character), Qcomposition,
-                                    Qnil);
-         if (NILP (ret))
+         Lisp_Object ret2 = Fget_char_attribute (ret, Qcomposition, Qnil);
+
+         if (NILP (ret2))
            {
-             decode_add_er_char (str, character, dst);
+             decode_add_er_char (str, char2, dst);
              str->combined_char_count = 0;
              str->combining_table = Qnil;
            }
@@ -3505,13 +3505,23 @@ COMPOSE_ADD_CHAR (struct decoding_stream *str,
            {
              str->combined_chars[0] = char2;
              str->combined_char_count = 1;
-             str->combining_table = ret;
+             str->combining_table = ret2;
            }
        }
       else
        {
+         ret = Fget_char_attribute (make_char (character), Qcomposition,
+                                    Qnil);
+
          COMPOSE_FLUSH_CHARS (str, dst);
-         decode_add_er_char (str, character, dst);
+         if (NILP (ret))
+           decode_add_er_char (str, character, dst);
+         else
+           {
+             str->combined_chars[0] = character;
+             str->combined_char_count = 1;
+             str->combining_table = ret;
+           }
        }
     }
 }