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.2b-004

diff -r 5d25cdc3c3f3 -r fddea6c03dee src/eval.c

--- a/src/eval.c Mon Jul 14 19:48:05 2008 +0000

+++ b/src/eval.c Mon Jul 14 21:05:15 2008 +0000

		@@ -14997,7 +14997,7 @@
14997	14997
14998	14998	/* Make 'cpoptions' empty, the 'l' flag should not be used here. */
14999	14999	save_cpo = p_cpo;
15000		- p_cpo = (char_u *)"";
	15000	+ p_cpo = empty_option;
15001	15001
15002	15002	#ifdef FEAT_RELTIME
15003	15003	/* Set the time limit, if there is one. */

		@@ -15112,7 +15112,11 @@
15112	15112	theend:
15113	15113	vim_free(pat2);
15114	15114	vim_free(pat3);
15115		- p_cpo = save_cpo;
	15115	+ if (p_cpo == empty_option)
	15116	+ p_cpo = save_cpo;
	15117	+ else
	15118	+ /* Darn, evaluating the {skip} expression changed the value. */
	15119	+ free_string_option(save_cpo);
15116	15120
15117	15121	return retval;
15118	15122	}

		@@ -22503,7 +22507,7 @@
22503	22507
22504	22508	/* Make 'cpoptions' empty, so that the 'l' flag doesn't work here */
22505	22509	save_cpo = p_cpo;
22506		- p_cpo = (char_u *)"";
	22510	+ p_cpo = empty_option;
22507	22511
22508	22512	ga_init2(&ga, 1, 200);
22509	22513

		@@ -22564,7 +22568,11 @@
22564	22568
22565	22569	ret = vim_strsave(ga.ga_data == NULL ? str : (char_u *)ga.ga_data);
22566	22570	ga_clear(&ga);
22567		- p_cpo = save_cpo;
	22571	+ if (p_cpo == empty_option)
	22572	+ p_cpo = save_cpo;
	22573	+ else
	22574	+ /* Darn, evaluating {sub} expression changed the value. */
	22575	+ free_string_option(save_cpo);
22568	22576
22569	22577	return ret;
22570	22578	}

diff -r 5d25cdc3c3f3 -r fddea6c03dee src/quickfix.c

--- a/src/quickfix.c Mon Jul 14 19:48:05 2008 +0000

+++ b/src/quickfix.c Mon Jul 14 21:05:15 2008 +0000

		@@ -3779,7 +3779,7 @@
3779	3779
3780	3780	/* Make 'cpoptions' empty, the 'l' flag should not be used here. */
3781	3781	save_cpo = p_cpo;
3782		- p_cpo = (char_u *)"";
	3782	+ p_cpo = empty_option;
3783	3783
3784	3784	#ifdef FEAT_MULTI_LANG
3785	3785	/* Check for a specified language */

		@@ -3889,7 +3889,11 @@
3889	3889	qi->qf_lists[qi->qf_curlist].qf_index = 1;
3890	3890	}
3891	3891
3892		- p_cpo = save_cpo;
	3892	+ if (p_cpo == empty_option)
	3893	+ p_cpo = save_cpo;
	3894	+ else
	3895	+ /* Darn, some plugin changed the value. */
	3896	+ free_string_option(save_cpo);
3893	3897
3894	3898	#ifdef FEAT_WINDOWS
3895	3899	qf_update_buffer(qi);

diff -r 5d25cdc3c3f3 -r fddea6c03dee src/version.c

--- a/src/version.c Mon Jul 14 19:48:05 2008 +0000

+++ b/src/version.c Mon Jul 14 21:05:15 2008 +0000

		@@ -677,6 +677,8 @@
677	677	static int included_patches[] =
678	678	{ /* Add new patch number below this line */
679	679	/**/
	680	+ 4,
	681	+/**/
680	682	3,
681	683	/**/
682	684	2,