X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Ffaces.h;h=e94c195f02f5d5ae3c26d9e5118e52b0a6bfc170;hb=f2654b5fc72f83bd12271d2547b0b1905a099741;hp=d57e8eeec2a8fb4583496492330e89be86449172;hpb=77dcef404dc78635f6ffa8f71a803d2bc7cc8921;p=chise%2Fxemacs-chise.git

diff --git a/src/faces.h b/src/faces.h
index d57e8ee..e94c195 100644
--- a/src/faces.h
+++ b/src/faces.h
@@ -234,12 +234,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 (*markobj) (Lisp_Object));
@@ -260,8 +260,8 @@ EXFUN (Fget_face, 1);
 
 extern Lisp_Object Qstrikethru, Vbuilt_in_face_specifiers, Vdefault_face;
 extern Lisp_Object Vleft_margin_face, Vpointer_face, Vright_margin_face;
-extern Lisp_Object Vtext_cursor_face, Vvertical_divider_face;
-extern Lisp_Object Vtoolbar_face, Vgui_element_face;
+extern Lisp_Object Vtext_cursor_face, Vvertical_divider_face; 
+extern Lisp_Object Vtoolbar_face, Vgui_element_face, Vwidget_face;
 
 void mark_all_faces_as_clean (void);
 void init_frame_faces (struct frame *f);
@@ -281,7 +281,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)