2 files changed, 13 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index ef97e097bf0..4b3b64f74bb 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2009-11-17  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * xsettings.c (something_changedCB, Ffont_get_system_font): Check
+        use_system_font.
+        (syms_of_xsettings): DEFVAR font-use-system-font.
+
 2009-11-17  Andreas Schwab  <schwab@linux-m68k.org>
 
         * xfns.c (x_default_font_parameter): Remove dead assignment.
diff --git a/src/xsettings.c b/src/xsettings.c
index 99ddd004718..71a7eaa86ca 100644
--- a/src/xsettings.c
+++ b/src/xsettings.c
@@ -40,6 +40,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 static char *current_mono_font;
 static struct x_display_info *first_dpyinfo;
 static Lisp_Object Qfont_name, Qfont_render;
+static int use_system_font;
 
 #ifdef HAVE_GCONF
 static GConfClient *gconf_client;
@@ -96,7 +97,7 @@ something_changedCB (client, cnxn_id, entry, user_data)
       for (dpyinfo = x_display_list; !found && dpyinfo; dpyinfo = dpyinfo->next)
         found = dpyinfo == first_dpyinfo;
 
-      if (found)
+      if (found && use_system_font)
         store_font_changed_event (Qfont_name,
                                   XCAR (first_dpyinfo->name_list_element));
     }
@@ -610,7 +611,7 @@ DEFUN ("font-get-system-font", Ffont_get_system_font, Sfont_get_system_font,
        doc: /* Get the system default monospaced font. */)
   ()
 {
-  return current_mono_font
+  return current_mono_font && use_system_font
     ? make_string (current_mono_font, strlen (current_mono_font))
     : Qnil;
 }
@@ -630,6 +631,10 @@ syms_of_xsettings ()
   staticpro (&Qfont_render);
   defsubr (&Sfont_get_system_font);
 
+  DEFVAR_BOOL ("font-use-system-font", &use_system_font,
+    doc: /* *Non-nil means to use the system defined font.  */);
+  use_system_font = 0;
+
 #ifdef HAVE_GCONF
   Fprovide (intern_c_string ("system-font-setting"), Qnil);
 #endif