summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2006-08-16 16:03:34 +0000
committerBram Moolenaar <Bram@vim.org>2006-08-16 16:03:34 +0000
commit0928caad1e63e90c5ddd8431915364954945dc87 (patch)
treead7c73c28524efee904c3566c6c76b5c867aa355
parent1c892474a8b8085ad65c51848c05ac70c2192ee5 (diff)
downloadvim-git-0928caad1e63e90c5ddd8431915364954945dc87.tar.gz
updated for version 7.0-058v7.0.058
-rw-r--r--src/mbyte.c2
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/mbyte.c b/src/mbyte.c
index c48da8e3d..bcfca8266 100644
--- 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 ef4fbac76..ce8e91d7c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 58,
+/**/
57,
/**/
56,