* xsettings.c, xsettings.h (xsettings_get_system_normal_font):

Define only if USE_LUCID.

diff --git a/src/ChangeLog b/src/ChangeLog
index 0d478b4cd07e7fb5c788daf2d07a130ec6a75acf..15e2aaf9714cc5983b15f26040f29b6ee75b33cf 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2011-04-14  Paul Eggert  <eggert@cs.ucla.edu>
 
+       * xsettings.c, xsettings.h (xsettings_get_system_normal_font):
+       Define only if USE_LUCID.
+
        * xrdb.c (x_customization_string, x_rm_string): Now static.
 
        * xmenu.c (x_menu_wait_for_event): Export only if USE_MOTIF.

diff --git a/src/xsettings.c b/src/xsettings.c
index da6d088db1500318f411671a1ec5a5ff244af43b..0d312f31bb9861b1a5a7c8738a2c7982a7df5ddb 100644 (file)
--- a/src/xsettings.c
+++ b/src/xsettings.c
@@ -691,11 +691,13 @@ xsettings_get_system_font (void)
   return current_mono_font;
 }
 
+#ifdef USE_LUCID
 const char *
 xsettings_get_system_normal_font (void)
 {
   return current_font;
 }
+#endif
 
 DEFUN ("font-get-system-normal-font", Ffont_get_system_normal_font,
        Sfont_get_system_normal_font,

diff --git a/src/xsettings.h b/src/xsettings.h
index 5b2fdbf43c59a51b059dae0fd09cd92716ddc3ee..38448eb88f599cac9b6d96c165df4a0fefe140a9 100644 (file)
--- a/src/xsettings.h
+++ b/src/xsettings.h
@@ -26,8 +26,9 @@ 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 */
-