From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 14 Apr 2011 03:08:55 +0000 (-0700)
Subject: * xsettings.c, xsettings.h (xsettings_get_system_normal_font):
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~298
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e87b6180b08c60a256dd8557945321ce2354a3a9;p=emacs.git

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

Define only if USE_LUCID.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 0d478b4cd07..15e2aaf9714 100644
--- 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 da6d088db15..0d312f31bb9 100644
--- 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 5b2fdbf43c5..38448eb88f5 100644
--- 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 */
-