* 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.

4 files changed, 9 insertions, 6 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 4b3b64f74bb..713bfe7d7d6 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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 --git a/src/lisp.h b/src/lisp.h
index c9e0c8a5d93..2052dfa0afc 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -3441,9 +3441,6 @@ extern void syms_of_xselect P_ ((void));
 
 /* 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 --git a/src/xfns.c b/src/xfns.c
index 2350fbfa9a4..3d7e89c19bd 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -63,6 +63,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <X11/bitmaps/gray>
 #endif
 
+#include "xsettings.h"
+
 #ifdef USE_GTK
 #include "gtkutil.h"
 #endif
@@ -98,8 +100,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <Xm/FileSB.h>
 #endif
 
-#include "xsettings.h"
-
 #if !defined(NO_EDITRES)
 #define HACK_EDITRES
 extern void _XEditResCheckMessages ();
diff --git a/src/xsettings.h b/src/xsettings.h
index f8d73db2ee0..503116bceec 100644
--- a/src/xsettings.h
+++ b/src/xsettings.h
@@ -20,7 +20,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #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 *));