(x_default_font_parameter): Try "monospace-12" too.

diff --git a/src/ChangeLog b/src/ChangeLog
index 43f9f1f2154c397ecb748c5d9ad56798052edd7a..4408c59cf37af17817c761960943a8248e172c1a 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2008-06-20  Kenichi Handa  <handa@m17n.org>
+
+       * xfns.c (x_default_font_parameter): Try "monospace-12" too.
+
 2008-06-20  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * w32fns.c, xfnc.c (x_default_font_parameter): Only set `font-param'

diff --git a/src/xfns.c b/src/xfns.c
index 0d31f015b82218ed5bee1baf00b9c142f9282c78..2bf4afa392c6b73513ce3b1d90444a05285508f1 100644 (file)
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -3073,6 +3073,8 @@ x_default_font_parameter (f, parms)
       char *names[]
        = { "-adobe-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-1",
            "-misc-fixed-medium-r-normal-*-*-140-*-*-c-*-iso8859-1",
+           /* This will find the normal Xft font.  */
+           "monospace-12",
            "-*-*-medium-r-normal-*-*-140-*-*-c-*-iso8859-1",
            /* This was formerly the first thing tried, but it finds
               too many fonts and takes too long.  */