aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/xsettings.c1
2 files changed, 3 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 4e476ca5e83..825bb816a87 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
12009-12-09 Andreas Schwab <schwab@linux-m68k.org> 12009-12-09 Andreas Schwab <schwab@linux-m68k.org>
2 2
3 * xsettings.c: Include "keyboard.h".
4
3 * gtkutil.c (xg_tool_bar_proxy_help_callback): Fix missing return. 5 * gtkutil.c (xg_tool_bar_proxy_help_callback): Fix missing return.
4 6
5 Fix implicit function declarations. 7 Fix implicit function declarations.
diff --git a/src/xsettings.c b/src/xsettings.c
index 9c4749f4036..946cfe7b899 100644
--- a/src/xsettings.c
+++ b/src/xsettings.c
@@ -24,6 +24,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
24#include "xterm.h" 24#include "xterm.h"
25#include "xsettings.h" 25#include "xsettings.h"
26#include "frame.h" 26#include "frame.h"
27#include "keyboard.h"
27#include "blockinput.h" 28#include "blockinput.h"
28#include "termhooks.h" 29#include "termhooks.h"
29#include "termopts.h" 30#include "termopts.h"