[Emacs-diffs] Changes to emacs/src/xfns.c,v

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      08/06/25 22:29:20

Index: xfns.c
===================================================================
RCS file: /sources/emacs/emacs/src/xfns.c,v
retrieving revision 1.718
retrieving revision 1.719
diff -u -b -r1.718 -r1.719
--- xfns.c      20 Jun 2008 02:15:09 -0000      1.718
+++ xfns.c      25 Jun 2008 22:29:20 -0000      1.719
@@ -3071,10 +3071,13 @@
   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.  */