diff --git a/ChangeLog b/ChangeLog
index 4498265c1..8dfd25511 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-07-10  suzuki toshiya  <mpsuzuki@hiroshima-u.ac.jp>
+
+	Fix another case reported in Savannah bug #30373.
+	Permit a face for Type1, Type42 and CFF without charmap,
+	patch by Tor Andersson.
+
+	* src/type1/t1objs.c (T1_Face_Init): Reset the error if it
+	is FT_Err_No_Unicode_Glyph_Name.
+	* src/type42/t42objs.c (T42_Face_Init): Ditto.
+	* src/cff/cffobjs.c (cff_face_init): Ditto.
+
 2010-07-09  suzuki toshiya  <mpsuzuki@hiroshima-u.ac.jp>
 
 	Use defined macros to set {platform,encoding}_id.
diff --git a/src/cff/cffobjs.c b/src/cff/cffobjs.c
index 8a47e2aa1..f8b07c356 100644
--- a/src/cff/cffobjs.c
+++ b/src/cff/cffobjs.c
@@ -902,6 +902,7 @@
                              &cmaprec, NULL );
         if ( error && FT_Err_No_Unicode_Glyph_Name != error )
           goto Exit;
+        error = FT_Err_Ok;
 
         /* if no Unicode charmap was previously selected, select this one */
         if ( cffface->charmap == NULL && nn != (FT_UInt)cffface->num_charmaps )
diff --git a/src/type1/t1objs.c b/src/type1/t1objs.c
index da6480647..58632109c 100644
--- a/src/type1/t1objs.c
+++ b/src/type1/t1objs.c
@@ -501,6 +501,7 @@
         error = FT_CMap_New( cmap_classes->unicode, NULL, &charmap, NULL );
         if ( error && FT_Err_No_Unicode_Glyph_Name != error )
           goto Exit;
+        error = FT_Err_Ok;
 
         /* now, generate an Adobe Standard encoding when appropriate */
         charmap.platform_id = TT_PLATFORM_ADOBE;
diff --git a/src/type42/t42objs.c b/src/type42/t42objs.c
index 9ba4a8295..a5e0ee5e8 100644
--- a/src/type42/t42objs.c
+++ b/src/type42/t42objs.c
@@ -338,6 +338,7 @@
         error = FT_CMap_New( cmap_classes->unicode, NULL, &charmap, NULL );
         if ( error && FT_Err_No_Unicode_Glyph_Name != error )
           goto Exit;
+        error = FT_Err_Ok;
 
         /* now, generate an Adobe Standard encoding when appropriate */
         charmap.platform_id = TT_PLATFORM_ADOBE;