update.

[chise/xemacs-chise.git.1] / src / faces.h

diff --git a/src/faces.h b/src/faces.h
index cd2d498..cf0be04 100644 (file)
--- a/src/faces.h
+++ b/src/faces.h
@@ -233,12 +233,12 @@ Lisp_Object ensure_face_cachel_contains_charset (struct face_cachel *cachel,
                                                 Lisp_Object charset);
 void ensure_face_cachel_complete (struct face_cachel *cachel,
                                  Lisp_Object domain,
-                                 unsigned char *charsets);
+                                 Charset_ID *charsets);
 void update_face_cachel_data (struct face_cachel *cachel,
                              Lisp_Object domain,
                              Lisp_Object face);
 void face_cachel_charset_font_metric_info (struct face_cachel *cachel,
-                                          unsigned char *charsets,
+                                          Charset_ID *charsets,
                                           struct font_metric_info *fm);
 void mark_face_cachels (face_cachel_dynarr *elements);
 void mark_face_cachels_as_clean (struct window *w);
@@ -279,7 +279,7 @@ void default_face_height_and_width_1 (Lisp_Object domain,
                                      int *height, int *width);
 
 #define FACE_CACHEL_FONT(cachel, charset) \
-  (cachel->font[XCHARSET_LEADING_BYTE (charset) - 128])
+  (cachel->font[XCHARSET_LEADING_BYTE (charset) - MIN_LEADING_BYTE])
 
 #define WINDOW_FACE_CACHEL(window, index) \
   Dynarr_atp ((window)->face_cachels, index)
@@ -341,9 +341,9 @@ Lisp_Object face_property_matching_instance (Lisp_Object face,
 #define FACE_PROPERTY_SPEC_LIST(face, property, locale)                        \
   Fspecifier_spec_list (FACE_PROPERTY_SPECIFIER (face, property),      \
                        locale, Qnil, Qnil)
-#define SET_FACE_PROPERTY(face, property, locale, value, tag, how_to_add) \
+#define SET_FACE_PROPERTY(face, property, value, locale, tag, how_to_add) \
   Fadd_spec_to_specifier (FACE_PROPERTY_SPECIFIER (face, property),    \
-                         locale, value, tag, how_to_add)
+                         value, locale, tag, how_to_add)
 
 #define FACE_FOREGROUND(face, domain)                                  \
   FACE_PROPERTY_INSTANCE (face, Qforeground, domain, 0, Qzero)