diff options
| author | Jan Djärv <jan.h.d@swipnet.se> | 2009-11-20 09:44:42 +0000 |
|---|---|---|
| committer | Jan Djärv <jan.h.d@swipnet.se> | 2009-11-20 09:44:42 +0000 |
| commit | 0d1d0d26a9f5634372da7f5b624e46fc2d54998b (patch) | |
| tree | 6060c7180398dd389b5813550e83f620c25c27ef /src/xsettings.h | |
| parent | 4a8e097d4ee5a28bcf551ee4fbeec3126c07be79 (diff) | |
| download | emacs-0d1d0d26a9f5634372da7f5b624e46fc2d54998b.tar.gz | |
Always suggest system font because .emacs may not have been read yet.
* xfns.c (x_default_font_parameter): Call xsettings_get_system_font.
* xsettings.h: Declare xsettings_get_system_font.
* xsettings.c (xsettings_get_system_font): New function.
(init_gconf): No use initiating gconf unless we have Xft also.
(syms_of_xsettings): Only provide system-font-setting if HAVE_XFT and
HAVE_GCONF.
Diffstat (limited to 'src/xsettings.h')
| -rw-r--r-- | src/xsettings.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/xsettings.h b/src/xsettings.h index 503116bceec..d1b3992bffe 100644 --- a/src/xsettings.h +++ b/src/xsettings.h @@ -24,6 +24,7 @@ EXFUN (Ffont_get_system_font, 0); extern void xsettings_initialize P_ ((struct x_display_info *dpyinfo)); extern void xft_settings_event P_ ((struct x_display_info *dpyinfo, XEvent *)); +extern const char *xsettings_get_system_font P_ ((void)); #endif /* XSETTINGS_H */ |