diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2019-06-18 20:21:40 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2019-06-18 20:21:40 +0300 |
| commit | 922121e7ddbc107da14ea9c1280d15c828e85063 (patch) | |
| tree | c44f63b0535fd8c19c719f2844319b06aefdf241 /src/w32fns.c | |
| parent | 4956e7610c782cace51943ee41f4c357703bdae1 (diff) | |
| download | emacs-922121e7ddbc107da14ea9c1280d15c828e85063.tar.gz emacs-922121e7ddbc107da14ea9c1280d15c828e85063.tar.bz2 emacs-922121e7ddbc107da14ea9c1280d15c828e85063.zip | |
Fix the handling of font backend supersedence on MS-Windows
* src/w32font.c (syms_of_w32font): Don't make the Uniscribe
font backend "superceded" here, ...
* src/w32uniscribe.c (syms_of_w32uniscribe_for_pdumper):
... make it "superceded" here, only if the HarfBuzz DLL was
successfully loaded. This is because Emacs compiled with
HarfBuzz support might run on a system without the DLL.
* src/w32fns.c (Fx_create_frame, w32_create_tip_frame):
Register the HarfBuzz font backend only if it is available.
Diffstat (limited to 'src/w32fns.c')
| -rw-r--r-- | src/w32fns.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/w32fns.c b/src/w32fns.c index 83830c616e5..acd9c80528a 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -5845,7 +5845,8 @@ DEFUN ("x-create-frame", Fx_create_frame, Sx_create_frame, } #ifdef HAVE_HARFBUZZ - register_font_driver (&harfbuzz_font_driver, f); + if (harfbuzz_available) + register_font_driver (&harfbuzz_font_driver, f); #endif register_font_driver (&uniscribe_font_driver, f); register_font_driver (&w32font_driver, f); @@ -6900,7 +6901,8 @@ w32_create_tip_frame (struct w32_display_info *dpyinfo, Lisp_Object parms) } #ifdef HAVE_HARFBUZZ - register_font_driver (&harfbuzz_font_driver, f); + if (harfbuzz_available) + register_font_driver (&harfbuzz_font_driver, f); #endif register_font_driver (&uniscribe_font_driver, f); register_font_driver (&w32font_driver, f); |