OSDN > Buscar Software > Vim > SCM > hg > vim > Commit

Vim
Fork

vim: Commit

Mirror of the Vim source from https://github.com/vim/vim

updated for version 7.0-206

diff -r 183c3187b20d -r 313ec58cdc49 src/mbyte.c

--- a/src/mbyte.c Tue Feb 27 22:03:05 2007 +0000

+++ b/src/mbyte.c Fri Mar 02 18:56:27 2007 +0000

diff -r 183c3187b20d -r 313ec58cdc49 src/option.c

--- a/src/option.c Tue Feb 27 22:03:05 2007 +0000

+++ b/src/option.c Fri Mar 02 18:56:27 2007 +0000

		@@ -3290,6 +3290,14 @@
3290	3290	* If not, go back to the default "latin1". */
3291	3291	save_enc = p_enc;
3292	3292	p_enc = p;
	3293	+ if (STRCMP(p_enc, "gb18030") == 0)
	3294	+ {
	3295	+ /* We don't support "gb18030", but "cp936" is a good substitute
	3296	+ * for practical purposes, thus use that. It's not an alias to
	3297	+ * still support conversion between gb18030 and utf-8. */
	3298	+ p_enc = vim_strsave((char_u *)"cp936");
	3299	+ vim_free(p);
	3300	+ }
3293	3301	if (mb_init() == NULL)
3294	3302	{
3295	3303	opt_idx = findoption((char_u *)"encoding");

diff -r 183c3187b20d -r 313ec58cdc49 src/version.c

--- a/src/version.c Tue Feb 27 22:03:05 2007 +0000

+++ b/src/version.c Fri Mar 02 18:56:27 2007 +0000

		@@ -667,6 +667,8 @@
667	667	static int included_patches[] =
668	668	{ /* Add new patch number below this line */
669	669	/**/
	670	+ 206,
	671	+/**/
670	672	205,
671	673	/**/
672	674	204,