comparison src/faces.h @ 5027:22179cd0fe15

merge
author Ben Wing <ben@xemacs.org>
date Wed, 10 Feb 2010 07:25:19 -0600
parents d95c102a96d3
children d0c14ea98592 b5df3737028a
comparison
equal deleted inserted replaced
5026:46cf825f6158 5027:22179cd0fe15
391 may delete any X11 frames; see the code at the end of 391 may delete any X11 frames; see the code at the end of
392 x_find_charset_font. */ 392 x_find_charset_font. */
393 #define FACE_FONT(face, domain, charset) \ 393 #define FACE_FONT(face, domain, charset) \
394 face_property_matching_instance (face, Qfont, charset, domain, \ 394 face_property_matching_instance (face, Qfont, charset, domain, \
395 ERROR_ME_DEBUG_WARN, 0, Qzero, \ 395 ERROR_ME_DEBUG_WARN, 0, Qzero, \
396 initial) 396 STAGE_INITIAL)
397 #define FACE_DISPLAY_TABLE(face, domain) \ 397 #define FACE_DISPLAY_TABLE(face, domain) \
398 FACE_PROPERTY_INSTANCE (face, Qdisplay_table, domain, 0, Qzero) 398 FACE_PROPERTY_INSTANCE (face, Qdisplay_table, domain, 0, Qzero)
399 #define FACE_BACKGROUND_PIXMAP(face, domain) \ 399 #define FACE_BACKGROUND_PIXMAP(face, domain) \
400 FACE_PROPERTY_INSTANCE (face, Qbackground_pixmap, domain, 0, Qzero) 400 FACE_PROPERTY_INSTANCE (face, Qbackground_pixmap, domain, 0, Qzero)
401 #define FACE_UNDERLINE_P(face, domain) \ 401 #define FACE_UNDERLINE_P(face, domain) \