(mother of J78-7057): Unify G-UU+976D, G-J78-7057, G-GT-57333,

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

diff --git a/src/mule-charset.c b/src/mule-charset.c
index 06a2b68..a60e790 100644 (file)
--- a/src/mule-charset.c
+++ b/src/mule-charset.c
@@ -1149,9 +1149,12 @@ charset_code_point (Lisp_Object charset, Emchar ch, int accepted_mode)
       Lisp_Object encoding_table = XCHARSET_ENCODING_TABLE (charset);
 
       if ( CHAR_TABLEP (encoding_table)
-          && INTP (ret = get_char_id_table (XCHAR_TABLE(encoding_table),
-                                            ch)) )
-       return XINT (ret);
+          && !UNBOUNDP (ret = get_char_id_table (XCHAR_TABLE(encoding_table),
+                                                 ch)) )
+       if ( INTP (ret) )
+         return XINT (ret);
+       else
+         return -1;
     }
     {
       Lisp_Object mother = XCHARSET_MOTHER (charset);
@@ -3493,7 +3496,7 @@ complex_vars_of_mule_charset (void)
                  build_string ("JIS X0208"),
                  build_string ("JIS X0208 Common"),
                  build_string ("JIS X0208 Common part"),
-                 build_string ("jisx0208\\.1990"),
+                 build_string ("jisx0208"),
                  - LEADING_BYTE_JAPANESE_JISX0208_1978,
                  Qnil,
                  MIN_CHAR_JIS_X0208_1990,