diff options
| author | Robert Pluim | 2020-03-16 17:21:02 +0100 |
|---|---|---|
| committer | Robert Pluim | 2020-03-17 16:58:09 +0100 |
| commit | 5747a59a886e16fadbd04c385c43628b1d8f50df (patch) | |
| tree | 0bc7cffa4d127fa213af9b13d7c050cc2c8e7b1b /src/xterm.h | |
| parent | a2dd8c4234c9a858e273ea22129962cee58fa4ce (diff) | |
| download | emacs-5747a59a886e16fadbd04c385c43628b1d8f50df.tar.gz emacs-5747a59a886e16fadbd04c385c43628b1d8f50df.zip | |
Recalculate default font when switching font backend
This is an updated version of the patch by Dmitry Antipov
<dmantipov@yandex.ru> in
<https://debbugs.gnu.org/cgi/bugreport.cgi?bug=23386#43>.
Fixes Bug#23386
* src/dispextern.h (struct redisplay_interface): New member
default_font_parameter.
* src/xterm.h: Add prototype for x_default_font_parameter.
* src/xterm.c (x_redisplay_interface): Initialize
default_font_parameter member.
* src/xfns.c (x_default_font_parameter): Make non-static.
* src/w32term.h: Add prototype for w32_default_font_parameter
* src/w32fns.c (w32_default_font_parameter): Make non-static.
* src/w32term.c (w32_redisplay_interface): Initialize
default_font_parameter member.
* src/nsterm.m (ns_redisplay_interface): Add dummy
ns_default_font_parameter (there is currently only one possible font
backend on macOS). Initialize default_font_parameter member.
* src/frame.c (gui_set_font_backend): Recalculate default font using
RIF default_font_parameter to avoid crash when changing font backend.
Diffstat (limited to 'src/xterm.h')
| -rw-r--r-- | src/xterm.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/xterm.h b/src/xterm.h index 51e75890b60..bc10043c54c 100644 --- a/src/xterm.h +++ b/src/xterm.h | |||
| @@ -1056,6 +1056,7 @@ extern void x_real_pos_and_offsets (struct frame *f, | |||
| 1056 | int *xptr, | 1056 | int *xptr, |
| 1057 | int *yptr, | 1057 | int *yptr, |
| 1058 | int *outer_border); | 1058 | int *outer_border); |
| 1059 | extern void x_default_font_parameter (struct frame* f, Lisp_Object parms); | ||
| 1059 | 1060 | ||
| 1060 | /* From xrdb.c. */ | 1061 | /* From xrdb.c. */ |
| 1061 | 1062 | ||