(mplist_deserialize): Extern it.

[m17n/m17n-lib.git] / src / m17n-gui.c

diff --git a/src/m17n-gui.c b/src/m17n-gui.c
index 2c3c011..45ca8d1 100644 (file)
--- a/src/m17n-gui.c
+++ b/src/m17n-gui.c
@@ -76,6 +76,7 @@ free_frame (void *object)
 
   M17N_OBJECT_UNREF (frame->face);
   mwin__close_device ((MFrame *) object);
+  free (frame->font);
   free (object);
 }
 
@@ -96,7 +97,7 @@ m17n_init_win (void)
   if (win_initialized)
     return;
   m17n_init ();
-  if (merror_code < 0)
+  if (merror_code != MERROR_NONE)
     return;
 
   Mfont = msymbol ("font");
@@ -313,7 +314,9 @@ mframe (MPlist *plist)
       MERROR (MERROR_WIN, NULL);
     }
 
-  frame->face = mface_copy (mface__default);
+  frame->face = mface_from_font (frame->font);
+  frame->face->property[MFACE_FONTSET] = mfontset (NULL);
+  M17N_OBJECT_REF (mface__default->property[MFACE_FONTSET]);
   if (plist)
     for (; (key = mplist_key (plist)) != Mnil; plist = mplist_next (plist))
       if (key == Mface)