From 477f8642b90ddb8dc66132728961d965e39ed5d0 Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Sat, 10 May 1997 03:37:01 +0000 Subject: [PATCH] (Fx_create_frame): Delete code for handling the X resouce "Fontset". --- src/xfns.c | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/src/xfns.c b/src/xfns.c index 56ec4455c7f..bbc83952bc6 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -3202,16 +3202,26 @@ This function is an internal primitive--use `make-frame' instead.") { Lisp_Object font; - font = x_get_arg (parms, Qfont, "font", "Font", string); - if (!STRINGP (font)) - font = x_get_arg (parms, Qfontset, "fontset", "Fontset", string); + /* Determine font by the following priority. + 1. `font' parameter in parms. + 2. `font' parameter in Vdefault_frame_alist. + 3. X resource "font" ("Font"). + 4. Select a plausible font be heuristics at least for ASCII. */ + tem = Fassq (Qfont, parms); + if (NILP (tem)) + tem = Fassq (Qfont, Vdefault_frame_alist); + if (!NILP (tem)) + font = Fcdr (tem); + if (! STRINGP (font)) + font = x_get_arg (parms, Qfont, "font", "Font", string); + BLOCK_INPUT; /* First, try whatever font the caller has specified. */ if (STRINGP (font)) { - Lisp_Object fontset = Fquery_fontset (font); - if (STRINGP (fontset)) - font = x_new_fontset (f, XSTRING (fontset)->data); + tem = Fquery_fontset (font); + if (STRINGP (tem)) + font = x_new_fontset (f, XSTRING (tem)->data); else font = x_new_font (f, XSTRING (font)->data); } @@ -3231,7 +3241,7 @@ This function is an internal primitive--use `make-frame' instead.") if (! STRINGP (font)) font = build_string ("fixed"); - x_default_parameter (f, parms, Qfont, font, + x_default_parameter (f, parms, Qfont, font, "font", "Font", string); } -- 2.39.5