aboutsummaryrefslogtreecommitdiffstats
path: root/src/dispextern.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/dispextern.h')
-rw-r--r--src/dispextern.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/dispextern.h b/src/dispextern.h
index bc2a76f1e02..2180c9ae63f 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -3429,11 +3429,12 @@ char *choose_face_font (struct frame *, Lisp_Object *, Lisp_Object,
3429#ifdef HAVE_WINDOW_SYSTEM 3429#ifdef HAVE_WINDOW_SYSTEM
3430void prepare_face_for_display (struct frame *, struct face *); 3430void prepare_face_for_display (struct frame *, struct face *);
3431#endif 3431#endif
3432int lookup_named_face (struct frame *, Lisp_Object, bool); 3432int lookup_named_face (struct window *, struct frame *, Lisp_Object, bool);
3433int lookup_basic_face (struct frame *, int); 3433int lookup_basic_face (struct window *, struct frame *, int);
3434int smaller_face (struct frame *, int, int); 3434int smaller_face (struct frame *, int, int);
3435int face_with_height (struct frame *, int, int); 3435int face_with_height (struct frame *, int, int);
3436int lookup_derived_face (struct frame *, Lisp_Object, int, bool); 3436int lookup_derived_face (struct window *, struct frame *,
3437 Lisp_Object, int, bool);
3437void init_frame_faces (struct frame *); 3438void init_frame_faces (struct frame *);
3438void free_frame_faces (struct frame *); 3439void free_frame_faces (struct frame *);
3439void recompute_basic_faces (struct frame *); 3440void recompute_basic_faces (struct frame *);
@@ -3443,7 +3444,7 @@ int face_for_overlay_string (struct window *, ptrdiff_t, ptrdiff_t *, ptrdiff_t,
3443 bool, Lisp_Object); 3444 bool, Lisp_Object);
3444int face_at_string_position (struct window *, Lisp_Object, ptrdiff_t, ptrdiff_t, 3445int face_at_string_position (struct window *, Lisp_Object, ptrdiff_t, ptrdiff_t,
3445 ptrdiff_t *, enum face_id, bool); 3446 ptrdiff_t *, enum face_id, bool);
3446int merge_faces (struct frame *, Lisp_Object, int, int); 3447int merge_faces (struct window *, Lisp_Object, int, int);
3447int compute_char_face (struct frame *, int, Lisp_Object); 3448int compute_char_face (struct frame *, int, Lisp_Object);
3448void free_all_realized_faces (Lisp_Object); 3449void free_all_realized_faces (Lisp_Object);
3449extern char unspecified_fg[], unspecified_bg[]; 3450extern char unspecified_fg[], unspecified_bg[];