1
0
forked from aniani/vim

updated for version 7.4.434

Problem:    gettabvar() is not consistent with getwinvar() and getbufvar().
Solution:   Return a dict with all variables when the varname is empty.
            (Yasuhiro Matsumoto)
This commit is contained in:
Bram Moolenaar
2014-09-09 16:13:08 +02:00
parent 13e2a0af66
commit 0e2ea1beb4
5 changed files with 18 additions and 4 deletions

View File

@@ -3575,6 +3575,8 @@ gettabvar({tabnr}, {varname} [, {def}]) *gettabvar()*
Get the value of a tab-local variable {varname} in tab page Get the value of a tab-local variable {varname} in tab page
{tabnr}. |t:var| {tabnr}. |t:var|
Tabs are numbered starting with one. Tabs are numbered starting with one.
When {varname} is empty a dictionary with all tab-local
variables is returned.
Note that the name without "t:" must be used. Note that the name without "t:" must be used.
When the tab or variable doesn't exist {def} or an empty When the tab or variable doesn't exist {def} or an empty
string is returned, there is no error message. string is returned, there is no error message.

View File

@@ -12071,7 +12071,8 @@ f_gettabvar(argvars, rettv)
typval_T *argvars; typval_T *argvars;
typval_T *rettv; typval_T *rettv;
{ {
tabpage_T *tp; win_T *win, *oldcurwin;
tabpage_T *tp, *oldtabpage;
dictitem_T *v; dictitem_T *v;
char_u *varname; char_u *varname;
int done = FALSE; int done = FALSE;
@@ -12083,13 +12084,21 @@ f_gettabvar(argvars, rettv)
tp = find_tabpage((int)get_tv_number_chk(&argvars[0], NULL)); tp = find_tabpage((int)get_tv_number_chk(&argvars[0], NULL));
if (tp != NULL && varname != NULL) if (tp != NULL && varname != NULL)
{ {
/* Set curwin to be our win, temporarily. Also set the tabpage,
* otherwise the window is not valid. */
switch_win(&oldcurwin, &oldtabpage, win, tp, TRUE);
/* look up the variable */ /* look up the variable */
v = find_var_in_ht(&tp->tp_vars->dv_hashtab, 0, varname, FALSE); /* Let gettabvar({nr}, "") return the "t:" dictionary. */
v = find_var_in_ht(&tp->tp_vars->dv_hashtab, 't', varname, FALSE);
if (v != NULL) if (v != NULL)
{ {
copy_tv(&v->di_tv, rettv); copy_tv(&v->di_tv, rettv);
done = TRUE; done = TRUE;
} }
/* restore previous notion of curwin */
restore_win(oldcurwin, oldtabpage, TRUE);
} }
if (!done && argvars[2].v_type != VAR_UNKNOWN) if (!done && argvars[2].v_type != VAR_UNKNOWN)

View File

@@ -55,6 +55,7 @@ STARTTEST
:tabnew :tabnew
:tabnew :tabnew
:let t:var_list = [1, 2, 3] :let t:var_list = [1, 2, 3]
:let t:other = 777
:let def_list = [4, 5, 6, 7] :let def_list = [4, 5, 6, 7]
:tabrewind :tabrewind
:$put =string(gettabvar(3, 'var_list')) :$put =string(gettabvar(3, 'var_list'))

View File

@@ -26,8 +26,8 @@ iso-8859-2
0 0
[1, 2, 3] [1, 2, 3]
[1, 2, 3] [1, 2, 3]
'' {'var_list': [1, 2, 3], 'other': 777}
[4, 5, 6, 7] {'var_list': [1, 2, 3], 'other': 777}
[4, 5, 6, 7] [4, 5, 6, 7]
'' ''
[4, 5, 6, 7] [4, 5, 6, 7]

View File

@@ -741,6 +741,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 */
/**/
434,
/**/ /**/
433, 433,
/**/ /**/