aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenichi Handa2008-06-20 02:15:52 +0000
committerKenichi Handa2008-06-20 02:15:52 +0000
commitd7afccca702a28656bf1e2a183f966b4411b5867 (patch)
tree03be64aeed01d996edde5d9d0b5c24b3ab8bae3d
parent770e2e6ed85e3c3fdf1f770ccbcb7f3120370c05 (diff)
downloademacs-d7afccca702a28656bf1e2a183f966b4411b5867.tar.gz
emacs-d7afccca702a28656bf1e2a183f966b4411b5867.zip
(x_default_font_parameter): Try "monospace-12" too.
-rw-r--r--src/ChangeLog4
-rw-r--r--src/xfns.c2
2 files changed, 6 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 43f9f1f2154..4408c59cf37 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12008-06-20 Kenichi Handa <handa@m17n.org>
2
3 * xfns.c (x_default_font_parameter): Try "monospace-12" too.
4
12008-06-20 Stefan Monnier <monnier@iro.umontreal.ca> 52008-06-20 Stefan Monnier <monnier@iro.umontreal.ca>
2 6
3 * w32fns.c, xfnc.c (x_default_font_parameter): Only set `font-param' 7 * w32fns.c, xfnc.c (x_default_font_parameter): Only set `font-param'
diff --git a/src/xfns.c b/src/xfns.c
index 0d31f015b82..2bf4afa392c 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -3073,6 +3073,8 @@ x_default_font_parameter (f, parms)
3073 char *names[] 3073 char *names[]
3074 = { "-adobe-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-1", 3074 = { "-adobe-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-1",
3075 "-misc-fixed-medium-r-normal-*-*-140-*-*-c-*-iso8859-1", 3075 "-misc-fixed-medium-r-normal-*-*-140-*-*-c-*-iso8859-1",
3076 /* This will find the normal Xft font. */
3077 "monospace-12",
3076 "-*-*-medium-r-normal-*-*-140-*-*-c-*-iso8859-1", 3078 "-*-*-medium-r-normal-*-*-140-*-*-c-*-iso8859-1",
3077 /* This was formerly the first thing tried, but it finds 3079 /* This was formerly the first thing tried, but it finds
3078 too many fonts and takes too long. */ 3080 too many fonts and takes too long. */