From: Chong Yidong <cyd@stupidchicken.com>
Date: Wed, 25 Jun 2008 22:29:20 +0000 (+0000)
Subject: (x_default_font_parameter): If Xft is available, first try
X-Git-Tag: emacs-pretest-23.0.90~4494
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=be9d013ae8b1ef4be47d71e7f15caba11071087c;p=emacs.git

(x_default_font_parameter): If Xft is available, first try
Monospace-12 for the default font.
---

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.  */