* 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 --git a/src/ChangeLog b/src/ChangeLog
index 4b3b64f74bb33901cccbfe58de84fe91573a99d6..713bfe7d7d662d925aa4400b2af3143d079e07b8 100644 (file)
--- 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 c9e0c8a5d9316d1ac4f70020a2154eafc16b6eee..2052dfa0afcd20d94f2729ab1ae8876349bf2b5f 100644 (file)
--- 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 2350fbfa9a486fe4393b67a3beaaf547c78db855..3d7e89c19bdc84994fec1e908d0b9387acfb0f05 100644 (file)
--- 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 f8d73db2ee0ba2da73b89c3b043c9b8e13959332..503116bceec75c5e8ecb33ab49364ffe7de6b838 100644 (file)
--- 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 *));