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.

1 files changed, 9 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index e1cce91b646..cefcd6145f8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,14 @@
 2009-11-20  Jan Djärv  <jan.h.d@swipnet.se>
 
+        * 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.
+
         * gtkutil.c (xg_modify_menubar_widgets): If menubar is totally empty
         add a blank entry so it doesn't collapse into nothing.