Merge from emacs-24; up to 2012-12-30T19:34:25Z!jan.h.d@swipnet.se

[bpt/emacs.git] / src / xsettings.h

diff --git a/src/xsettings.h b/src/xsettings.h
index 66005cf..e3738c5 100644 (file)
--- a/src/xsettings.h
+++ b/src/xsettings.h
@@ -1,6 +1,6 @@
 /* Functions for handle font changes dynamically.
-   Copyright (C) 2009, 2010, 2011
-                 Free Software Foundation, Inc.
+
+Copyright (C) 2009-2013 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -20,14 +20,13 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #ifndef XSETTINGS_H
 #define XSETTINGS_H
 
-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);
+#ifdef USE_LUCID
 extern const char *xsettings_get_system_normal_font (void);
+#endif
 
 
 #endif /* XSETTINGS_H */
-