updated for version 7.0-206

diff --git a/src/mbyte.c b/src/mbyte.c
index 735bf6544b997a7d2e4d5e1a08073fe781af5761..f508f8a1cd085f4e54355c4e14be0e99337ced8e 100644 (file)
--- a/src/mbyte.c
+++ b/src/mbyte.c
@@ -364,7 +364,6 @@ enc_alias_table[] =
     {"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/option.c b/src/option.c
index 0bd218c9786e978879d5bfcb853d803b307410b7..3be56120616da206c00cbc1618b7f58496f2e7eb 100644 (file)
--- a/src/option.c
+++ b/src/option.c
@@ -3290,6 +3290,14 @@ set_init_1()
         * If not, go back to the default "latin1". */
        save_enc = p_enc;
        p_enc = p;
+       if (STRCMP(p_enc, "gb18030") == 0)
+       {
+           /* We don't support "gb18030", but "cp936" is a good substitute
+            * for practical purposes, thus use that.  It's not an alias to
+            * still support conversion between gb18030 and utf-8. */
+           p_enc = vim_strsave((char_u *)"cp936");
+           vim_free(p);
+       }
        if (mb_init() == NULL)
        {
            opt_idx = findoption((char_u *)"encoding");

diff --git a/src/version.c b/src/version.c
index c9508b969a2460ead939283b1cd6361288e5a52d..caffda0fbd5750ac974bd747cc3ee9f8b02e61cc 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 */
+/**/
+    206,
 /**/
     205,
 /**/