diff options
Diffstat (limited to 'src/haikuterm.c')
| -rw-r--r-- | src/haikuterm.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/src/haikuterm.c b/src/haikuterm.c index 4e32b747160..496480cbc09 100644 --- a/src/haikuterm.c +++ b/src/haikuterm.c @@ -3007,9 +3007,11 @@ haiku_default_font_parameter (struct frame *f, Lisp_Object parms) font = font_open_by_spec (f, Ffont_get_system_font ()); if (NILP (font)) - font = !NILP (font_param) ? font_param - : gui_display_get_arg (dpyinfo, parms, Qfont, "font", "Font", - RES_TYPE_STRING); + font = (!NILP (font_param) + ? font_param + : gui_display_get_arg (dpyinfo, parms, Qfont, + "font", "Font", + RES_TYPE_STRING)); if (! FONTP (font) && ! STRINGP (font)) { @@ -3029,13 +3031,6 @@ haiku_default_font_parameter (struct frame *f, Lisp_Object parms) if (NILP (font)) error ("No suitable font was found"); } - else if (!NILP (font_param)) - { - /* Remember the explicit font parameter, so we can re-apply it - after we've applied the `default' face settings. */ - AUTO_FRAME_ARG (arg, Qfont_parameter, font_param); - gui_set_frame_parameters (f, arg); - } gui_default_parameter (f, parms, Qfont, font, "font", "Font", RES_TYPE_STRING); |