aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorStefan Monnier2010-04-23 11:50:48 -0400
committerStefan Monnier2010-04-23 11:50:48 -0400
commitff5dec5cd103f6a9b030d295b014f0ff81025def (patch)
treed62be3d88cdd852393c2d76da65d2f14b035c4aa /src
parent706a0137ff6a830879ee24e5ad030c8e448db9b0 (diff)
downloademacs-ff5dec5cd103f6a9b030d295b014f0ff81025def.tar.gz
emacs-ff5dec5cd103f6a9b030d295b014f0ff81025def.zip
* gtkutil.c: Include xsettings.h for Ftool_bar_get_system_style.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/gtkutil.c1
2 files changed, 5 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 966fc74744d..161bdb80e15 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12010-04-23 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * gtkutil.c: Include xsettings.h for Ftool_bar_get_system_style.
4
12010-04-23 Eli Zaretskii <eliz@gnu.org> 52010-04-23 Eli Zaretskii <eliz@gnu.org>
2 6
3 Support `display' text properties and overlay strings in bidi 7 Support `display' text properties and overlay strings in bidi
diff --git a/src/gtkutil.c b/src/gtkutil.c
index d9312909bf3..c0e5c6f970f 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -35,6 +35,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
35#include "charset.h" 35#include "charset.h"
36#include "coding.h" 36#include "coding.h"
37#include <gdk/gdkkeysyms.h> 37#include <gdk/gdkkeysyms.h>
38#include "xsettings.h"
38 39
39#ifdef HAVE_XFT 40#ifdef HAVE_XFT
40#include <X11/Xft/Xft.h> 41#include <X11/Xft/Xft.h>