(Fput_char_table_map_function): Fixed.

(word_boundary_p): Don't check charset in XEmacs CHISE.

diff --git a/src/chartab.c b/src/chartab.c
index b82b45f..6f7df43 100644 (file)
--- a/src/chartab.c
+++ b/src/chartab.c
@@ -2374,7 +2374,8 @@ For internal use.  Don't use it.
 */
        (c, value))
 {
-  put_char_id_table_0 (char_attribute_table_to_put, c, value_to_put);
+  put_char_id_table_0 (char_attribute_table_to_put,
+                      XCHAR (c), value_to_put);
   return Qnil;
 }
 #endif
@@ -4190,16 +4191,20 @@ word_boundary_p (Emchar c1, Emchar c2)
     c2 = cmpchar_component (c2, 0, 1);
 #endif
 
+#ifndef UTF2000
   if (EQ (CHAR_CHARSET (c1), CHAR_CHARSET (c2)))
+#endif
     {
       tail = Vword_separating_categories;
       default_result = 0;
     }
+#ifndef UTF2000
   else
     {
       tail = Vword_combining_categories;
       default_result = 1;
     }
+#endif
 
   category_set1 = CATEGORY_SET (c1);
   if (NILP (category_set1))