merge trunk

[gnu-emacs] / src / xsettings.h

diff --git a/src/xsettings.h b/src/xsettings.h
index f8d73db2ee0ba2da73b89c3b043c9b8e13959332..50819d456c8e59ab5c25ff40a5db78365556d265 100644 (file)
--- a/src/xsettings.h
+++ b/src/xsettings.h
@@ -1,5 +1,5 @@
 /* Functions for handle font changes dynamically.
-   Copyright (C) 2009
+   Copyright (C) 2009, 2010
                  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
@@ -20,10 +20,18 @@ 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));
-extern void xsettings_initialize P_ ((struct x_display_info *dpyinfo));
-extern void xft_settings_event P_ ((struct x_display_info *dpyinfo,
-                                    XEvent *));
+EXFUN (Ffont_get_system_font, 0);
+EXFUN (Ffont_get_system_normal_font, 0);
+EXFUN (Ftool_bar_get_system_style, 0);
+
+extern void xsettings_initialize (struct x_display_info *dpyinfo);
+extern void xft_settings_event (struct x_display_info *dpyinfo,
+                                XEvent *);
+extern const char *xsettings_get_system_font (void);
+extern const char *xsettings_get_system_normal_font (void);
 
 
 #endif /* XSETTINGS_H */
+
+/* arch-tag: 2c0f5c49-e925-4452-b778-4c082da6dd72
+   (do not change this comment) */