thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

updated for version 7.2a-002

Browse Source
This commit is contained in:
Bram Moolenaar
2008-06-27 18:26:11 +00:00
parent 00ca284cc0
commit 632deedd0f
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/eval.c
View File

@@ -10441,18 +10441,13 @@ f_getbufvar(argvars, rettv)
rettv->vval.v_string = NULL; rettv->vval.v_string = NULL;
if (buf != NULL && varname != NULL) if (buf != NULL && varname != NULL)
{
if (*varname == '&') /* buffer-local-option */
{ {
/* set curbuf to be our buf, temporarily */ /* set curbuf to be our buf, temporarily */
save_curbuf = curbuf; save_curbuf = curbuf;
curbuf = buf; curbuf = buf;
if (*varname == '&') /* buffer-local-option */
get_option_tv(&varname, rettv, TRUE); get_option_tv(&varname, rettv, TRUE);
/* restore previous notion of curbuf */
curbuf = save_curbuf;
}
else else
{ {
if (*varname == NUL) if (*varname == NUL)
@@ -10461,10 +10456,13 @@ f_getbufvar(argvars, rettv)
* find_var_in_ht(). */ * find_var_in_ht(). */
varname = (char_u *)"b:" + 2; varname = (char_u *)"b:" + 2;
/* look up the variable */ /* look up the variable */
v = find_var_in_ht(&buf->b_vars.dv_hashtab, varname, FALSE); v = find_var_in_ht(&curbuf->b_vars.dv_hashtab, varname, FALSE);
if (v != NULL) if (v != NULL)
copy_tv(&v->di_tv, rettv); copy_tv(&v->di_tv, rettv);
} }
/* restore previous notion of curbuf */
curbuf = save_curbuf;
} }
--emsg_off; --emsg_off;

2
src/version.c
View File

@@ -676,6 +676,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 */
/**/
2,
/**/ /**/
1, 1,
/**/ /**/