--- src/init.c.orig	Sat Nov 27 22:21:41 1999
+++ src/init.c	Sat Nov 27 22:21:17 1999
@@ -398,8 +398,8 @@
 {
   DEBUG_MSG ("rcfile_init started\n");
   cfg_browser_cline = g_strdup ("netscape -remote OpenUrl\\(%s\\)");
-  cfg_editor_font = g_strdup ("fixed");
-  cfg_tab_font = g_strdup ("fixed");
+  cfg_editor_font = g_strdup ("fixed,*");
+  cfg_tab_font = g_strdup ("fixed,*");
   cfg_tab_pos = g_strdup ("bottom");
   cfg_weblint_cline = g_strdup ("weblint");
   cfg_thumbnailstring = g_strdup ("_thumbnail");
--- src/configure.c.orig	Sun Nov 14 21:43:56 1999
+++ src/configure.c	Sat Nov 27 22:29:30 1999
@@ -121,7 +121,7 @@
   vbox = gtk_vbox_new (FALSE, 0);
   gtk_container_add (GTK_CONTAINER (frame), vbox);
 
-  font_e = string_entry2 ("Default Font", cfg_editor_font, vbox);
+  font_e = string_entry2 ("Default FontSet", cfg_editor_font, vbox);
 
   label = gtk_label_new ("Tab width");
   adjust = gtk_adjustment_new (1.0 * cfg_editor_tabwidth, 1, 20, 1, 1, 0);
@@ -279,7 +279,7 @@
 	  style = gtk_style_new ();
 	  tmpfont = style->font;
 
-	  style->font = gdk_font_load (cfg_tab_font);
+	  style->font = gdk_fontset_load (cfg_tab_font);
 	  if (style->font)
 	    {
 	      gdk_font_unref (tmpfont);
@@ -298,7 +298,7 @@
 	  style = gtk_style_new ();
 	  tmpfont = style->font;
 
-	  style->font = gdk_font_load (cfg_editor_font);
+	  style->font = gdk_fontset_load (cfg_editor_font);
 	  if (style->font)
 	    {
 	      gdk_font_unref (tmpfont);
