aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChong Yidong2008-06-25 22:29:20 +0000
committerChong Yidong2008-06-25 22:29:20 +0000
commitbe9d013ae8b1ef4be47d71e7f15caba11071087c (patch)
tree08fd6d605371ba891c08f6435bd74766dc092b92 /src
parentbd02793aba6ae76bf91a9b7e4422756696069f3a (diff)
downloademacs-be9d013ae8b1ef4be47d71e7f15caba11071087c.tar.gz
emacs-be9d013ae8b1ef4be47d71e7f15caba11071087c.zip
(x_default_font_parameter): If Xft is available, first try
Monospace-12 for the default font.
Diffstat (limited to 'src')
-rw-r--r--src/xfns.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/xfns.c b/src/xfns.c
index 2bf4afa392c..dc9d98f5a18 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -3071,10 +3071,13 @@ x_default_font_parameter (f, parms)
3071 if (! STRINGP (font)) 3071 if (! STRINGP (font))
3072 { 3072 {
3073 char *names[] 3073 char *names[]
3074 = { "-adobe-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-1", 3074 = {
3075 "-misc-fixed-medium-r-normal-*-*-140-*-*-c-*-iso8859-1", 3075#ifdef HAVE_XFT
3076 /* This will find the normal Xft font. */ 3076 /* This will find the normal Xft font. */
3077 "monospace-12", 3077 "Monospace-12",
3078#endif
3079 "-adobe-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-1",
3080 "-misc-fixed-medium-r-normal-*-*-140-*-*-c-*-iso8859-1",
3078 "-*-*-medium-r-normal-*-*-140-*-*-c-*-iso8859-1", 3081 "-*-*-medium-r-normal-*-*-140-*-*-c-*-iso8859-1",
3079 /* This was formerly the first thing tried, but it finds 3082 /* This was formerly the first thing tried, but it finds
3080 too many fonts and takes too long. */ 3083 too many fonts and takes too long. */