diff options
author | Chong Yidong <cyd@stupidchicken.com> | 2008-06-25 22:29:20 +0000 |
---|---|---|
committer | Chong Yidong <cyd@stupidchicken.com> | 2008-06-25 22:29:20 +0000 |
commit | be9d013ae8b1ef4be47d71e7f15caba11071087c (patch) | |
tree | 08fd6d605371ba891c08f6435bd74766dc092b92 /src/xfns.c | |
parent | bd02793aba6ae76bf91a9b7e4422756696069f3a (diff) | |
download | emacs-be9d013ae8b1ef4be47d71e7f15caba11071087c.tar.gz emacs-be9d013ae8b1ef4be47d71e7f15caba11071087c.tar.bz2 emacs-be9d013ae8b1ef4be47d71e7f15caba11071087c.zip |
(x_default_font_parameter): If Xft is available, first try
Monospace-12 for the default font.
Diffstat (limited to 'src/xfns.c')
-rw-r--r-- | src/xfns.c | 9 |
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) if (! STRINGP (font)) { char *names[] - = { "-adobe-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-1", - "-misc-fixed-medium-r-normal-*-*-140-*-*-c-*-iso8859-1", + = { +#ifdef HAVE_XFT /* This will find the normal Xft font. */ - "monospace-12", + "Monospace-12", +#endif + "-adobe-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-1", + "-misc-fixed-medium-r-normal-*-*-140-*-*-c-*-iso8859-1", "-*-*-medium-r-normal-*-*-140-*-*-c-*-iso8859-1", /* This was formerly the first thing tried, but it finds too many fonts and takes too long. */ |