aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

updated for version 7.0-206

Browse Source
This commit is contained in:
Bram Moolenaar 2007-03-02 18:56:27 +00:00
parent 33c4fb68bf
commit 733f0a286e
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/mbyte.c
View File

@ -364,7 +364,6 @@ enc_alias_table[] =
{"949", IDX_CP949}, {"949", IDX_CP949},
{"936", IDX_CP936}, {"936", IDX_CP936},
{"gbk", IDX_CP936}, {"gbk", IDX_CP936},
{"gb18030", IDX_CP936}, /* only 99% the same */
{"950", IDX_CP950}, {"950", IDX_CP950},
{"eucjp", IDX_EUC_JP}, {"eucjp", IDX_EUC_JP},
{"unix-jis", IDX_EUC_JP}, {"unix-jis", IDX_EUC_JP},

8
src/option.c
View File

@ -3290,6 +3290,14 @@ set_init_1()
* If not, go back to the default "latin1". */ * If not, go back to the default "latin1". */
save_enc = p_enc; save_enc = p_enc;
p_enc = p; 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) if (mb_init() == NULL)
{ {
opt_idx = findoption((char_u *)"encoding"); opt_idx = findoption((char_u *)"encoding");

2
src/version.c
View File

@ -666,6 +666,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
206,
/**/ /**/
205, 205,
/**/ /**/