Mercurial > emacs

diff src/xsettings.c @ 106237:7ddab4671153

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
xsettings.c: Revert changes from 2009-11-23. Just use Xft defaults (bug #5025).
author Jan Djärv <jan.h.d@swipnet.se>
date Wed, 25 Nov 2009 16:19:51 +0000
parents 01190029e5d3
children 3b90f039f42b
line wrap: on
line diff
--- a/src/xsettings.c	Wed Nov 25 06:08:42 2009 +0000
+++ b/src/xsettings.c	Wed Nov 25 16:19:51 2009 +0000
@@ -367,24 +367,6 @@
   return rc == Success;
 }
 
-static void
-set_default_xft_settings (dpyinfo)
-     struct x_display_info *dpyinfo;
-{
-  FcPattern *pat;
-  pat = FcPatternCreate ();
-  XftDefaultSubstitute (dpyinfo->display,
-                        XScreenNumberOfScreen (dpyinfo->screen),
-                        pat);
-
-  FcPatternDel (pat, FC_ANTIALIAS);
-  FcPatternAddBool (pat, FC_ANTIALIAS, FcTrue);
-  FcPatternDel (pat, FC_HINTING);
-  FcPatternAddBool (pat, FC_HINTING, FcTrue);
-  FcPatternDel (pat, FC_HINT_STYLE);
-  FcPatternAddInteger (pat, FC_HINT_STYLE,FC_HINT_MEDIUM);
-  XftDefaultSet (dpyinfo->display, pat);
-}
 
 static void
 apply_xft_settings (dpyinfo, send_event_p)
@@ -565,8 +547,6 @@
   get_prop_window (dpyinfo);
   if (dpyinfo->xsettings_window != None)
     apply_xft_settings (dpyinfo, False);
-  else
-    set_default_xft_settings (dpyinfo);
 
   UNBLOCK_INPUT;