From: handa <handa>
Date: Wed, 9 Mar 2005 05:38:32 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: REL-1-3-0~356
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d67c6bdc38589273d9e86c43719619aec0826bb1;p=m17n%2Fm17n-lib.git

*** empty log message ***
---

diff --git a/src/ChangeLog b/src/ChangeLog
index e45634e..48fad2e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2005-03-09  handa  <handa@m17n.org>
+
+	* m17n-gui.c (m17n_init_win): Set merror_code to MERROR_NONE before
+	calling m17n_init ().
+
+	* m17n.c (m17n_init): Set merror_code to MERROR_NONE before
+	calling m17n_init_core ().
+
 2005-02-28  Kenichi Handa  <handa@m17n.org>
 
 	* font-flt.c (mfont__flt_run): Add resulting code sequence in
diff --git a/src/m17n-gui.c b/src/m17n-gui.c
index acf65e3..7e1e594 100644
--- a/src/m17n-gui.c
+++ b/src/m17n-gui.c
@@ -239,6 +239,7 @@ m17n_init_win (void)
 
   if (m17n__gui_initialized++)
     return;
+  merror_code = MERROR_NONE;
   m17n_init ();
   if (merror_code != MERROR_NONE)
     {