diff options
| author | Dmitry Antipov | 2012-06-27 19:46:48 +0400 |
|---|---|---|
| committer | Dmitry Antipov | 2012-06-27 19:46:48 +0400 |
| commit | 2014308a5dc2d82a136212e0eb7eeea61838bbe7 (patch) | |
| tree | 28a50159789f64356a8cd47e0e371d92aa67a002 /src/xsettings.c | |
| parent | d5c6faf921772e523fc224333d8af142c830a7e6 (diff) | |
| download | emacs-2014308a5dc2d82a136212e0eb7eeea61838bbe7.tar.gz emacs-2014308a5dc2d82a136212e0eb7eeea61838bbe7.zip | |
* alloc.c (allocate_string_data): Remove dead code.
* xsettings.c (XSETTINGS_FONT_NAME): Move under HAVE_XFT to
avoid GCC warning about unused macro.
Diffstat (limited to 'src/xsettings.c')
| -rw-r--r-- | src/xsettings.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/xsettings.c b/src/xsettings.c index 69ef22f55d7..a4e3849a652 100644 --- a/src/xsettings.c +++ b/src/xsettings.c | |||
| @@ -159,8 +159,9 @@ store_tool_bar_style_changed (const char *newstyle, | |||
| 159 | XCAR (dpyinfo->name_list_element)); | 159 | XCAR (dpyinfo->name_list_element)); |
| 160 | } | 160 | } |
| 161 | 161 | ||
| 162 | 162 | #ifdef HAVE_XFT | |
| 163 | #define XSETTINGS_FONT_NAME "Gtk/FontName" | 163 | #define XSETTINGS_FONT_NAME "Gtk/FontName" |
| 164 | #endif | ||
| 164 | #define XSETTINGS_TOOL_BAR_STYLE "Gtk/ToolbarStyle" | 165 | #define XSETTINGS_TOOL_BAR_STYLE "Gtk/ToolbarStyle" |
| 165 | 166 | ||
| 166 | enum { | 167 | enum { |