aboutsummaryrefslogtreecommitdiffstats
path: root/src/dispextern.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/dispextern.h')
-rw-r--r--src/dispextern.h12
1 files changed, 2 insertions, 10 deletions
diff --git a/src/dispextern.h b/src/dispextern.h
index ee17b65deaa..8b70985803a 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -1795,16 +1795,6 @@ struct face_cache
1795 bool_bf menu_face_changed_p : 1; 1795 bool_bf menu_face_changed_p : 1;
1796}; 1796};
1797 1797
1798
1799/* Prepare face FACE for use on frame F. This must be called before
1800 using X resources of FACE. */
1801
1802#define PREPARE_FACE_FOR_DISPLAY(F, FACE) \
1803 do { \
1804 if ((FACE)->gc == 0) \
1805 prepare_face_for_display ((F), (FACE)); \
1806 } while (false)
1807
1808/* Return a pointer to the face with ID on frame F, or null if such a 1798/* Return a pointer to the face with ID on frame F, or null if such a
1809 face doesn't exist. */ 1799 face doesn't exist. */
1810 1800
@@ -3354,7 +3344,9 @@ unsigned long load_color (struct frame *, struct face *, Lisp_Object,
3354 enum lface_attribute_index); 3344 enum lface_attribute_index);
3355char *choose_face_font (struct frame *, Lisp_Object *, Lisp_Object, 3345char *choose_face_font (struct frame *, Lisp_Object *, Lisp_Object,
3356 int *); 3346 int *);
3347#ifdef HAVE_WINDOW_SYSTEM
3357void prepare_face_for_display (struct frame *, struct face *); 3348void prepare_face_for_display (struct frame *, struct face *);
3349#endif
3358int lookup_named_face (struct frame *, Lisp_Object, int); 3350int lookup_named_face (struct frame *, Lisp_Object, int);
3359int lookup_basic_face (struct frame *, int); 3351int lookup_basic_face (struct frame *, int);
3360int smaller_face (struct frame *, int, int); 3352int smaller_face (struct frame *, int, int);