This commit was generated by cvs2svn to compensate for changes in r5670,

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

diff --git a/src/faces.h b/src/faces.h
index 2755ad8..7d4523e 100644 (file)
--- a/src/faces.h
+++ b/src/faces.h
@@ -215,7 +215,7 @@ struct face_cachel
      right sort are available on the system.  In this case, the
      whole program will just crash.  For the moment, this is
      OK (for debugging purposes) but we should fix this by
-     storing a "blank font" if the instantiation fails. */
+     storing a "blank font" if the instantation fails. */
   unsigned int dirty :1;
   unsigned int updated :1;
   /* #### Of course we should use a bit array or something. */
@@ -226,6 +226,7 @@ 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,
@@ -240,7 +241,8 @@ void update_face_cachel_data (struct face_cachel *cachel,
 void face_cachel_charset_font_metric_info (struct face_cachel *cachel,
                                           unsigned char *charsets,
                                           struct font_metric_info *fm);
-void mark_face_cachels (face_cachel_dynarr *elements);
+void mark_face_cachels (face_cachel_dynarr *elements,
+                       void (*markobj) (Lisp_Object));
 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);
@@ -259,7 +261,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 Vtoolbar_face, Vgui_element_face, Vwidget_face;
+extern Lisp_Object Vtoolbar_face, Vgui_element_face;
 
 void mark_all_faces_as_clean (void);
 void init_frame_faces (struct frame *f);