aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-29 04:34:16 -04:00
Code Activity

updated for version 7.0-124

Browse Source
This commit is contained in:
Bram Moolenaar
2006-10-10 10:55:47 +00:00
parent a1b5aa52c4
commit 69a7e43028
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/eval.c
View File

@@ -10432,20 +10432,14 @@ getwinvar(argvars, rettv, off)
if (win != NULL && varname != NULL) if (win != NULL && varname != NULL)
{ {
/* Set curwin to be our win, temporarily. Also set curbuf, so
* that we can get buffer-local options. */
oldcurwin = curwin;
curwin = win;
curbuf = win->w_buffer;
if (*varname == '&') /* window-local-option */ if (*varname == '&') /* window-local-option */
{
/* Set curwin to be our win, temporarily. Also set curbuf, so
* that we can get buffer-local options. */
oldcurwin = curwin;
curwin = win;
curbuf = win->w_buffer;
get_option_tv(&varname, rettv, 1); get_option_tv(&varname, rettv, 1);
/* restore previous notion of curwin */
curwin = oldcurwin;
curbuf = curwin->w_buffer;
}
else else
{ {
if (*varname == NUL) if (*varname == NUL)
@@ -10458,6 +10452,10 @@ getwinvar(argvars, rettv, off)
if (v != NULL) if (v != NULL)
copy_tv(&v->di_tv, rettv); copy_tv(&v->di_tv, rettv);
} }
/* restore previous notion of curwin */
curwin = oldcurwin;
curbuf = curwin->w_buffer;
} }
--emsg_off; --emsg_off;

2
src/version.c
View File

@@ -666,6 +666,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
124,
/**/ /**/
123, 123,
/**/ /**/