OSDN > Finden 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.2a-002

diff -r 68f005107052 -r e1c7d0ea5dac src/eval.c

--- a/src/eval.c Thu Jun 26 20:14:00 2008 +0000

+++ b/src/eval.c Fri Jun 27 18:26:11 2008 +0000

		@@ -10442,17 +10442,12 @@
10442	10442
10443	10443	if (buf != NULL && varname != NULL)
10444	10444	{
	10445	+ /* set curbuf to be our buf, temporarily */
	10446	+ save_curbuf = curbuf;
	10447	+ curbuf = buf;
	10448	+
10445	10449	if (varname == '&') / buffer-local-option */
10446		- {
10447		- /* set curbuf to be our buf, temporarily */
10448		- save_curbuf = curbuf;
10449		- curbuf = buf;
10450		-
10451	10450	get_option_tv(&varname, rettv, TRUE);
10452		-
10453		- /* restore previous notion of curbuf */
10454		- curbuf = save_curbuf;
10455		- }
10456	10451	else
10457	10452	{
10458	10453	if (*varname == NUL)

		@@ -10461,10 +10456,13 @@
10461	10456	* find_var_in_ht(). */
10462	10457	varname = (char_u *)"b:" + 2;
10463	10458	/* look up the variable */
10464		- v = find_var_in_ht(&buf->b_vars.dv_hashtab, varname, FALSE);
	10459	+ v = find_var_in_ht(&curbuf->b_vars.dv_hashtab, varname, FALSE);
10465	10460	if (v != NULL)
10466	10461	copy_tv(&v->di_tv, rettv);
10467	10462	}
	10463	+
	10464	+ /* restore previous notion of curbuf */
	10465	+ curbuf = save_curbuf;
10468	10466	}
10469	10467
10470	10468	--emsg_off;

diff -r 68f005107052 -r e1c7d0ea5dac src/version.c

--- a/src/version.c Thu Jun 26 20:14:00 2008 +0000

+++ b/src/version.c Fri Jun 27 18:26:11 2008 +0000

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