[Emacs-diffs] emacs/src ChangeLog lisp.h xfns.c xsettings.h

[Andreas Schwab]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Andreas Schwab <schwab> 09/11/17 21:57:50

Modified files:
        src            : ChangeLog lisp.h xfns.c xsettings.h 

Log message:
        * 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.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7879&r2=1.7880
http://cvs.savannah.gnu.org/viewcvs/emacs/src/lisp.h?cvsroot=emacs&r1=1.676&r2=1.677
http://cvs.savannah.gnu.org/viewcvs/emacs/src/xfns.c?cvsroot=emacs&r1=1.751&r2=1.752
http://cvs.savannah.gnu.org/viewcvs/emacs/src/xsettings.h?cvsroot=emacs&r1=1.1&r2=1.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7879
retrieving revision 1.7880
diff -u -b -r1.7879 -r1.7880
--- ChangeLog   17 Nov 2009 20:17:49 -0000      1.7879
+++ ChangeLog   17 Nov 2009 21:57:48 -0000      1.7880
@@ -1,3 +1,9 @@
+2009-11-17  Andreas Schwab  <address@hidden>
+
+       * 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  <address@hidden>
 
        * xsettings.c (something_changedCB, Ffont_get_system_font): Check

Index: lisp.h
===================================================================
RCS file: /sources/emacs/emacs/src/lisp.h,v
retrieving revision 1.676
retrieving revision 1.677
diff -u -b -r1.676 -r1.677
--- lisp.h      17 Nov 2009 19:11:54 -0000      1.676
+++ lisp.h      17 Nov 2009 21:57:49 -0000      1.677
@@ -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

Index: xfns.c
===================================================================
RCS file: /sources/emacs/emacs/src/xfns.c,v
retrieving revision 1.751
retrieving revision 1.752
diff -u -b -r1.751 -r1.752
--- xfns.c      17 Nov 2009 19:13:16 -0000      1.751
+++ xfns.c      17 Nov 2009 21:57:49 -0000      1.752
@@ -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 ();

Index: xsettings.h
===================================================================
RCS file: /sources/emacs/emacs/src/xsettings.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- xsettings.h 17 Nov 2009 08:21:36 -0000      1.1
+++ xsettings.h 17 Nov 2009 21:57:50 -0000      1.2
@@ -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 *));