Sync with r21-2-26.

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

diff --git a/src/faces.h b/src/faces.h
index c2e821d..f96e0a6 100644 (file)
--- a/src/faces.h
+++ b/src/faces.h
@@ -226,7 +226,6 @@ DECLARE_LRECORD (face, struct Lisp_Face);
 #define XFACE(x) XRECORD (x, face, struct Lisp_Face)
 #define XSETFACE(x, p) XSETRECORD (x, p, face)
 #define FACEP(x) RECORDP (x, face)
-#define GC_FACEP(x) GC_RECORDP (x, face)
 #define CHECK_FACE(x) CHECK_RECORD (x, face)
 
 Lisp_Object ensure_face_cachel_contains_charset (struct face_cachel *cachel,
@@ -234,15 +233,14 @@ 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));
+void mark_face_cachels (face_cachel_dynarr *elements);
 void mark_face_cachels_as_clean (struct window *w);
 void mark_face_cachels_as_not_updated (struct window *w);
 void reset_face_cachel (struct face_cachel *inst);
@@ -260,7 +258,7 @@ 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 Vtext_cursor_face, Vvertical_divider_face;
 extern Lisp_Object Vtoolbar_face, Vgui_element_face, Vwidget_face;
 
 void mark_all_faces_as_clean (void);
@@ -281,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)