[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/src ChangeLog xsettings.c
From: |
Jan Djärv |
Subject: |
[Emacs-diffs] emacs/src ChangeLog xsettings.c |
Date: |
Wed, 25 Nov 2009 16:19:54 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Jan Djärv <jhd> 09/11/25 16:19:54
Modified files:
src : ChangeLog xsettings.c
Log message:
xsettings.c: Revert changes from 2009-11-23. Just use Xft defaults (bug
#5025).
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7895&r2=1.7896
http://cvs.savannah.gnu.org/viewcvs/emacs/src/xsettings.c?cvsroot=emacs&r1=1.7&r2=1.8
Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7895
retrieving revision 1.7896
diff -u -b -r1.7895 -r1.7896
--- ChangeLog 24 Nov 2009 21:33:23 -0000 1.7895
+++ ChangeLog 25 Nov 2009 16:19:51 -0000 1.7896
@@ -1,3 +1,8 @@
+2009-11-25 Jan Djärv <address@hidden>
+
+ * xsettings.c: Revert changes from 2009-11-23. Just use Xft
+ defaults (bug #5025).
+
2009-11-24 Stefan Monnier <address@hidden>
* insdel.c (adjust_markers_for_delete): Move it in the
Index: xsettings.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/xsettings.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- xsettings.c 23 Nov 2009 08:55:10 -0000 1.7
+++ xsettings.c 25 Nov 2009 16:19:53 -0000 1.8
@@ -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;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs/src ChangeLog xsettings.c,
Jan Djärv <=