# HG changeset patch
# User Jan Dj¸«£rv <jan.h.d@swipnet.se>
# Date 1259165991 0
# Node ID 7ddab46711534d8f83962027175bd14e8577cef5
# Parent  4436585c0829b4e6d4d06d219e322489afa6c8a2
xsettings.c: Revert changes from 2009-11-23. Just use Xft defaults (bug #5025).

diff -r 4436585c0829 -r 7ddab4671153 src/ChangeLog
--- a/src/ChangeLog	Wed Nov 25 06:08:42 2009 +0000
+++ b/src/ChangeLog	Wed Nov 25 16:19:51 2009 +0000
@@ -1,3 +1,8 @@
+2009-11-25  Jan DjƤrv  <jan.h.d@swipnet.se>
+
+	* xsettings.c: Revert changes from 2009-11-23. Just use Xft
+	defaults (bug #5025).
+
 2009-11-24  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* insdel.c (adjust_markers_for_delete): Move it in the
diff -r 4436585c0829 -r 7ddab4671153 src/xsettings.c
--- 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;