Merge from mainline.

1 files changed, 4 insertions, 2 deletions

diff --git a/src/xsettings.c b/src/xsettings.c
index 24ea48e7b67..2513bcc5aa8 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,
@@ -718,8 +720,8 @@ DEFUN ("font-get-system-font", Ffont_get_system_font, Sfont_get_system_font,
     : Qnil;
 }
 
-DEFUN ("tool-bar-get-system-style", Ftool_bar_get_system_style, Stool_bar_get_system_style,
-       0, 0, 0,
+DEFUN ("tool-bar-get-system-style", Ftool_bar_get_system_style,
+       Stool_bar_get_system_style, 0, 0, 0,
        doc: /* Get the system tool bar style.
 If no system tool bar style is known, return `tool-bar-style' if set to a
 known style.  Otherwise return image.  */)