OSDN > 브라 우즈 소프트웨어 > 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-124

diff -r 86289e90a4bb -r f49d72bf9c5c src/eval.c

--- a/src/eval.c Tue Oct 10 09:41:28 2006 +0000

+++ b/src/eval.c Tue Oct 10 10:55:47 2006 +0000

		@@ -10432,20 +10432,14 @@
10432	10432
10433	10433	if (win != NULL && varname != NULL)
10434	10434	{
	10435	+ /* Set curwin to be our win, temporarily. Also set curbuf, so
	10436	+ * that we can get buffer-local options. */
	10437	+ oldcurwin = curwin;
	10438	+ curwin = win;
	10439	+ curbuf = win->w_buffer;
	10440	+
10435	10441	if (varname == '&') / window-local-option */
10436		- {
10437		- /* Set curwin to be our win, temporarily. Also set curbuf, so
10438		- * that we can get buffer-local options. */
10439		- oldcurwin = curwin;
10440		- curwin = win;
10441		- curbuf = win->w_buffer;
10442		-
10443	10442	get_option_tv(&varname, rettv, 1);
10444		-
10445		- /* restore previous notion of curwin */
10446		- curwin = oldcurwin;
10447		- curbuf = curwin->w_buffer;
10448		- }
10449	10443	else
10450	10444	{
10451	10445	if (*varname == NUL)

		@@ -10458,6 +10452,10 @@
10458	10452	if (v != NULL)
10459	10453	copy_tv(&v->di_tv, rettv);
10460	10454	}
	10455	+
	10456	+ /* restore previous notion of curwin */
	10457	+ curwin = oldcurwin;
	10458	+ curbuf = curwin->w_buffer;
10461	10459	}
10462	10460
10463	10461	--emsg_off;

diff -r 86289e90a4bb -r f49d72bf9c5c src/version.c

--- a/src/version.c Tue Oct 10 09:41:28 2006 +0000

+++ b/src/version.c Tue Oct 10 10:55:47 2006 +0000

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