projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| 9b1d76b7 AG |
1 | To: vim-dev@vim.org |
| 2 | Subject: patch 7.0.206 | |
| 3 | Fcc: outbox | |
| 4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
| 5 | Mime-Version: 1.0 | |
| 6 | Content-Type: text/plain; charset=ISO-8859-1 | |
| 7 | Content-Transfer-Encoding: 8bit | |
| 8 | ------------ | |
| 9 | ||
| 10 | Patch 7.0.206 (after 7.0.058) | |
| 11 | Problem: Some characters of the "gb18030" encoding are not handled | |
| 12 | properly. | |
| 13 | Solution: Do not use "cp936" as an alias for "gb18030" encoding. Instead | |
| 14 | initialize 'encoding' to "cp936". | |
| 15 | Files: src/mbyte.c, src/option.c | |
| 16 | ||
| 17 | ||
| 18 | *** ../vim-7.0.205/src/mbyte.c Tue Dec 5 22:09:02 2006 | |
| 19 | --- src/mbyte.c Tue Feb 27 16:27:44 2007 | |
| 20 | *************** | |
| 21 | *** 364,370 **** | |
| 22 | {"949", IDX_CP949}, | |
| 23 | {"936", IDX_CP936}, | |
| 24 | {"gbk", IDX_CP936}, | |
| 25 | - {"gb18030", IDX_CP936}, /* only 99% the same */ | |
| 26 | {"950", IDX_CP950}, | |
| 27 | {"eucjp", IDX_EUC_JP}, | |
| 28 | {"unix-jis", IDX_EUC_JP}, | |
| 29 | --- 364,369 ---- | |
| 30 | *** ../vim-7.0.205/src/option.c Tue Oct 17 18:36:03 2006 | |
| 31 | --- src/option.c Thu Mar 1 21:02:06 2007 | |
| 32 | *************** | |
| 33 | *** 3290,3295 **** | |
| 34 | --- 3290,3303 ---- | |
| 35 | * If not, go back to the default "latin1". */ | |
| 36 | save_enc = p_enc; | |
| 37 | p_enc = p; | |
| 38 | + if (STRCMP(p_enc, "gb18030") == 0) | |
| 39 | + { | |
| 40 | + /* We don't support "gb18030", but "cp936" is a good substitute | |
| 41 | + * for practical purposes, thus use that. It's not an alias to | |
| 42 | + * still support conversion between gb18030 and utf-8. */ | |
| 43 | + p_enc = vim_strsave((char_u *)"cp936"); | |
| 44 | + vim_free(p); | |
| 45 | + } | |
| 46 | if (mb_init() == NULL) | |
| 47 | { | |
| 48 | opt_idx = findoption((char_u *)"encoding"); | |
| 49 | *** ../vim-7.0.205/src/version.c Tue Feb 27 23:06:44 2007 | |
| 50 | --- src/version.c Fri Mar 2 19:58:04 2007 | |
| 51 | *************** | |
| 52 | *** 668,669 **** | |
| 53 | --- 668,671 ---- | |
| 54 | { /* Add new patch number below this line */ | |
| 55 | + /**/ | |
| 56 | + 206, | |
| 57 | /**/ | |
| 58 | ||
| 59 | -- | |
| 60 | You can tune a file system, but you can't tuna fish | |
| 61 | -- man tunefs | |
| 62 | ||
| 63 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 64 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 65 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
| 66 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |