# HG changeset patch
# User Andreas Schwab <schwab@linux-m68k.org>
# Date 1258495068 0
# Node ID 8c46fe65b4c6f523f713bcb122d66cbe696282c8
# Parent  5fa329215a9376a839b0cfdcf5c3c2946ca0ff31
* lisp.h: Remove declaration of Ffont_get_system_font.
* xfns.c: Move include of "xsettings.h".
* xsettings.h: Use EXFUN to declare Ffont_get_system_font.

diff -r 5fa329215a93 -r 8c46fe65b4c6 src/ChangeLog
--- a/src/ChangeLog	Tue Nov 17 20:17:46 2009 +0000
+++ b/src/ChangeLog	Tue Nov 17 21:57:48 2009 +0000
@@ -1,3 +1,9 @@
+2009-11-17  Andreas Schwab  <schwab@linux-m68k.org>
+
+	* lisp.h: Remove declaration of Ffont_get_system_font.
+	* xfns.c: Move include of "xsettings.h".
+	* xsettings.h: Use EXFUN to declare Ffont_get_system_font.
+
 2009-11-17  Jan Djärv  <jan.h.d@swipnet.se>
 
 	* xsettings.c (something_changedCB, Ffont_get_system_font): Check
diff -r 5fa329215a93 -r 8c46fe65b4c6 src/lisp.h
--- a/src/lisp.h	Tue Nov 17 20:17:46 2009 +0000
+++ b/src/lisp.h	Tue Nov 17 21:57:48 2009 +0000
@@ -3441,9 +3441,6 @@
 
 /* Defined in xterm.c */
 extern void syms_of_xterm P_ ((void));
-
-/* Defined in xsettings.c */
-EXFUN (Ffont_get_system_font, 0);
 #endif /* HAVE_X_WINDOWS */
 
 #ifdef MSDOS
diff -r 5fa329215a93 -r 8c46fe65b4c6 src/xfns.c
--- a/src/xfns.c	Tue Nov 17 20:17:46 2009 +0000
+++ b/src/xfns.c	Tue Nov 17 21:57:48 2009 +0000
@@ -63,6 +63,8 @@
 #include <X11/bitmaps/gray>
 #endif
 
+#include "xsettings.h"
+
 #ifdef USE_GTK
 #include "gtkutil.h"
 #endif
@@ -98,8 +100,6 @@
 #include <Xm/FileSB.h>
 #endif
 
-#include "xsettings.h"
-
 #if !defined(NO_EDITRES)
 #define HACK_EDITRES
 extern void _XEditResCheckMessages ();
diff -r 5fa329215a93 -r 8c46fe65b4c6 src/xsettings.h
--- a/src/xsettings.h	Tue Nov 17 20:17:46 2009 +0000
+++ b/src/xsettings.h	Tue Nov 17 21:57:48 2009 +0000
@@ -20,7 +20,7 @@
 #ifndef XSETTINGS_H
 #define XSETTINGS_H
 
-extern Lisp_Object Ffont_get_system_font P_ ((void));
+EXFUN (Ffont_get_system_font, 0);
 extern void xsettings_initialize P_ ((struct x_display_info *dpyinfo));
 extern void xft_settings_event P_ ((struct x_display_info *dpyinfo,
                                     XEvent *));