aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2011-04-13 20:08:55 -0700
committerPaul Eggert2011-04-13 20:08:55 -0700
commite87b6180b08c60a256dd8557945321ce2354a3a9 (patch)
tree78c87520fca8cfaa77fb49267619c7ab052ce3be /src
parentac64929e093edfc052160cdcbbf1a06596e26899 (diff)
downloademacs-e87b6180b08c60a256dd8557945321ce2354a3a9.tar.gz
emacs-e87b6180b08c60a256dd8557945321ce2354a3a9.zip
* xsettings.c, xsettings.h (xsettings_get_system_normal_font):
Define only if USE_LUCID.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog3
-rw-r--r--src/xsettings.c2
-rw-r--r--src/xsettings.h3
3 files changed, 7 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 0d478b4cd07..15e2aaf9714 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
12011-04-14 Paul Eggert <eggert@cs.ucla.edu> 12011-04-14 Paul Eggert <eggert@cs.ucla.edu>
2 2
3 * xsettings.c, xsettings.h (xsettings_get_system_normal_font):
4 Define only if USE_LUCID.
5
3 * xrdb.c (x_customization_string, x_rm_string): Now static. 6 * xrdb.c (x_customization_string, x_rm_string): Now static.
4 7
5 * xmenu.c (x_menu_wait_for_event): Export only if USE_MOTIF. 8 * 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)
691 return current_mono_font; 691 return current_mono_font;
692} 692}
693 693
694#ifdef USE_LUCID
694const char * 695const char *
695xsettings_get_system_normal_font (void) 696xsettings_get_system_normal_font (void)
696{ 697{
697 return current_font; 698 return current_font;
698} 699}
700#endif
699 701
700DEFUN ("font-get-system-normal-font", Ffont_get_system_normal_font, 702DEFUN ("font-get-system-normal-font", Ffont_get_system_normal_font,
701 Sfont_get_system_normal_font, 703 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);
26extern void xft_settings_event (struct x_display_info *dpyinfo, 26extern void xft_settings_event (struct x_display_info *dpyinfo,
27 XEvent *); 27 XEvent *);
28extern const char *xsettings_get_system_font (void); 28extern const char *xsettings_get_system_font (void);
29#ifdef USE_LUCID
29extern const char *xsettings_get_system_normal_font (void); 30extern const char *xsettings_get_system_normal_font (void);
31#endif
30 32
31 33
32#endif /* XSETTINGS_H */ 34#endif /* XSETTINGS_H */
33