updated for version 7.0-058

diff --git a/src/mbyte.c b/src/mbyte.c
index c48da8e3d71a1118cec7b066799addc52357412b..bcfca82663e9cfe86f26407270b956e16d27eb58 100644 (file)
--- a/src/mbyte.c
+++ b/src/mbyte.c
@@ -363,6 +363,8 @@ enc_alias_table[] =
     {"932",            IDX_CP932},
     {"949",            IDX_CP949},
     {"936",            IDX_CP936},
+    {"gbk",            IDX_CP936},
+    {"gb18030",                IDX_CP936},     /* only 99% the same */
     {"950",            IDX_CP950},
     {"eucjp",          IDX_EUC_JP},
     {"unix-jis",       IDX_EUC_JP},

diff --git a/src/version.c b/src/version.c
index ef4fbac76bee7fe54b65c56f4f341c4b2097c114..ce8e91d7ca57140a741a3a0f582f186fcabdbe1f 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    58,
 /**/
     57,
 /**/