aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/xfns.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/src/xfns.c b/src/xfns.c
index c93b0816bbb..ed7f726889c 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -3274,19 +3274,8 @@ This function is an internal primitive--use `make-frame' instead.")
3274 { 3274 {
3275 Lisp_Object font; 3275 Lisp_Object font;
3276 3276
3277 /* Determine font by the following priority.
3278 1. `font' parameter in parms.
3279 2. `font' parameter in Vdefault_frame_alist.
3280 3. X resource "font" ("Font").
3281 4. Select a plausible font be heuristics at least for ASCII. */
3282 tem = Fassq (Qfont, parms);
3283 if (NILP (tem))
3284 tem = Fassq (Qfont, Vdefault_frame_alist);
3285 if (!NILP (tem))
3286 font = Fcdr (tem);
3287 if (! STRINGP (font)) 3277 if (! STRINGP (font))
3288 font = x_get_arg (dpyinfo, parms, Qfont, "font", "Font", string); 3278 font = x_get_arg (dpyinfo, parms, Qfont, "font", "Font", string);
3289
3290 BLOCK_INPUT; 3279 BLOCK_INPUT;
3291 /* First, try whatever font the caller has specified. */ 3280 /* First, try whatever font the caller has specified. */
3292 if (STRINGP (font)) 3281 if (STRINGP (font))