diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2021-08-19 16:48:59 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2021-08-19 16:48:59 -0700 |
| commit | 07fcbb558d797272b9f43547da60beda485873a3 (patch) | |
| tree | 77d5da14e9f9d9d8b1d877c70c01296fd3893796 /src/dispextern.h | |
| parent | c9bdeff3e45a7ac84a74a81bb048046f82dddc91 (diff) | |
| parent | fb81c8c3adf8633f2f617c82f6019aef630860c7 (diff) | |
| download | emacs-07fcbb558d797272b9f43547da60beda485873a3.tar.gz | |
Merge remote-tracking branch 'origin/master' into athena/unstable
Diffstat (limited to 'src/dispextern.h')
| -rw-r--r-- | src/dispextern.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/dispextern.h b/src/dispextern.h index f4e872644db..33fcaa4c078 100644 --- a/src/dispextern.h +++ b/src/dispextern.h @@ -1262,8 +1262,6 @@ extern struct glyph space_glyph; /* True means last display completed. False means it was preempted. */ extern bool display_completed; - - /************************************************************************ Glyph Strings @@ -3066,6 +3064,11 @@ struct image is created. */ unsigned long face_foreground, face_background; + /* Details of the font, only really relevant for types like SVG that + allow us to draw text. */ + int face_font_size; + char *face_font_family; + /* True if this image has a `transparent' background -- that is, is uses an image mask. The accessor macro for this is `IMAGE_BACKGROUND_TRANSPARENT'. */ @@ -3636,7 +3639,7 @@ extern void gui_update_window_begin (struct window *); extern void gui_update_window_end (struct window *, bool, bool); #endif void do_pending_window_change (bool); -void change_frame_size (struct frame *, int, int, bool, bool, bool, bool); +void change_frame_size (struct frame *, int, int, bool, bool, bool); void init_display (void); void syms_of_display (void); extern void spec_glyph_lookup_face (struct window *, GLYPH *); |