aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKenichi Handa2006-06-16 12:14:37 +0000
committerKenichi Handa2006-06-16 12:14:37 +0000
commit25c252565874a9578b4d143d79bc3ec63321ef8a (patch)
tree5f42e1060dfcfc6bf9d5a1b6114c10dd74ed3326 /src
parent5ce00b69d4e5bdb7448859ef698561a46119e773 (diff)
downloademacs-25c252565874a9578b4d143d79bc3ec63321ef8a.tar.gz
emacs-25c252565874a9578b4d143d79bc3ec63321ef8a.zip
(x_default_font_parameter): Try also "fixed", and signal
error here if no suitable font was found.
Diffstat (limited to 'src')
-rw-r--r--src/xfns.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/xfns.c b/src/xfns.c
index b4d16615fb0..5924ba21f88 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -2986,6 +2986,7 @@ x_default_font_parameter (f, parms)
2986 /* If those didn't work, look for something which will 2986 /* If those didn't work, look for something which will
2987 at least work. */ 2987 at least work. */
2988 "-*-fixed-*-*-*-*-*-140-*-*-c-*-iso8859-1", 2988 "-*-fixed-*-*-*-*-*-140-*-*-c-*-iso8859-1",
2989 "fixed",
2989 NULL }; 2990 NULL };
2990 int i; 2991 int i;
2991 2992
@@ -2996,7 +2997,7 @@ x_default_font_parameter (f, parms)
2996 break; 2997 break;
2997 } 2998 }
2998 if (NILP (font)) 2999 if (NILP (font))
2999 font = build_string ("fixed"); 3000 error ("No suitable font was found");
3000 } 3001 }
3001 x_default_parameter (f, parms, Qfont, font, "font", "Font", RES_TYPE_STRING); 3002 x_default_parameter (f, parms, Qfont, font, "font", "Font", RES_TYPE_STRING);
3002} 3003}