X-Git-Url: http://git.chise.org/gitweb/?p=chise%2Fxemacs-chise.git.1;a=blobdiff_plain;f=src%2Ffaces.h;h=fa4a85a3c3a6d12b33846106ea16427b4d9340f3;hp=2755ad8b3431bb866b71786c80a346c2c670609a;hb=716cfba952c1dc0d2cf5c968971f3780ba728a89;hpb=ea1ea793fe6e244ef5555ed983423a204101af13 diff --git a/src/faces.h b/src/faces.h index 2755ad8..fa4a85a 100644 --- a/src/faces.h +++ b/src/faces.h @@ -21,14 +21,14 @@ Boston, MA 02111-1307, USA. */ /* Synched up with: Not in FSF. */ -#ifndef _XEMACS_FACES_H_ -#define _XEMACS_FACES_H_ +#ifndef INCLUDED_faces_h_ +#define INCLUDED_faces_h_ #include "buffer.h" /* for NUM_LEADING_BYTES */ -/* a struct Lisp_Face is the C object corresponding to a face. There - is one of these per face. It basically contains all of the specifiers - for the built-in face properties, plus the plist of user-specified +/* a Lisp_Face is the C object corresponding to a face. There is one + of these per face. It basically contains all of the specifiers for + the built-in face properties, plus the plist of user-specified properties. */ struct Lisp_Face @@ -222,8 +222,8 @@ struct face_cachel unsigned char font_updated[NUM_LEADING_BYTES]; }; -DECLARE_LRECORD (face, struct Lisp_Face); -#define XFACE(x) XRECORD (x, face, struct Lisp_Face) +DECLARE_LRECORD (face, Lisp_Face); +#define XFACE(x) XRECORD (x, face, Lisp_Face) #define XSETFACE(x, p) XSETRECORD (x, p, face) #define FACEP(x) RECORDP (x, face) #define CHECK_FACE(x) CHECK_RECORD (x, face) @@ -258,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); @@ -358,6 +358,8 @@ Lisp_Object face_property_matching_instance (Lisp_Object face, FACE_PROPERTY_INSTANCE (face, Qbackground_pixmap, domain, 0, Qzero) #define FACE_UNDERLINE_P(face, domain) \ (!NILP (FACE_PROPERTY_INSTANCE (face, Qunderline, domain, 0, Qzero))) +#define FACE_STRIKETHRU_P(face, domain) \ + (!NILP (FACE_PROPERTY_INSTANCE (face, Qstrikethru, domain, 0, Qzero))) #define FACE_HIGHLIGHT_P(face, domain) \ (!NILP (FACE_PROPERTY_INSTANCE (face, Qhighlight, domain, 0, Qzero))) #define FACE_DIM_P(face, domain) \ @@ -367,4 +369,4 @@ Lisp_Object face_property_matching_instance (Lisp_Object face, #define FACE_REVERSE_P(face, domain) \ (!NILP (FACE_PROPERTY_INSTANCE (face, Qreverse, domain, 0, Qzero))) -#endif /* _XEMACS_FACES_H_ */ +#endif /* INCLUDED_faces_h_ */