|
 |
073263 |
To: vim_dev@googlegroups.com
|
|
|
073263 |
Subject: Patch 7.4.434
|
|
|
073263 |
Fcc: outbox
|
|
|
073263 |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
073263 |
Mime-Version: 1.0
|
|
|
073263 |
Content-Type: text/plain; charset=UTF-8
|
|
|
073263 |
Content-Transfer-Encoding: 8bit
|
|
|
073263 |
------------
|
|
|
073263 |
|
|
|
073263 |
Patch 7.4.434
|
|
|
073263 |
Problem: gettabvar() is not consistent with getwinvar() and getbufvar().
|
|
|
073263 |
Solution: Return a dict with all variables when the varname is empty.
|
|
|
073263 |
(Yasuhiro Matsumoto)
|
|
|
073263 |
Files: src/eval.c, runtime/doc/eval.txt, src/testdir/test91.in,
|
|
|
073263 |
src/testdir/test91.ok
|
|
|
073263 |
|
|
|
073263 |
|
|
|
073263 |
*** ../vim-7.4.433/src/eval.c 2014-08-29 15:53:43.706453155 +0200
|
|
|
073263 |
--- src/eval.c 2014-09-09 16:03:34.372530448 +0200
|
|
|
073263 |
***************
|
|
|
073263 |
*** 12071,12077 ****
|
|
|
073263 |
typval_T *argvars;
|
|
|
073263 |
typval_T *rettv;
|
|
|
073263 |
{
|
|
|
073263 |
! tabpage_T *tp;
|
|
|
073263 |
dictitem_T *v;
|
|
|
073263 |
char_u *varname;
|
|
|
073263 |
int done = FALSE;
|
|
|
073263 |
--- 12071,12078 ----
|
|
|
073263 |
typval_T *argvars;
|
|
|
073263 |
typval_T *rettv;
|
|
|
073263 |
{
|
|
|
073263 |
! win_T *win, *oldcurwin;
|
|
|
073263 |
! tabpage_T *tp, *oldtabpage;
|
|
|
073263 |
dictitem_T *v;
|
|
|
073263 |
char_u *varname;
|
|
|
073263 |
int done = FALSE;
|
|
|
073263 |
***************
|
|
|
073263 |
*** 12083,12095 ****
|
|
|
073263 |
tp = find_tabpage((int)get_tv_number_chk(&argvars[0], NULL));
|
|
|
073263 |
if (tp != NULL && varname != NULL)
|
|
|
073263 |
{
|
|
|
073263 |
/* look up the variable */
|
|
|
073263 |
! v = find_var_in_ht(&tp->tp_vars->dv_hashtab, 0, varname, FALSE);
|
|
|
073263 |
if (v != NULL)
|
|
|
073263 |
{
|
|
|
073263 |
copy_tv(&v->di_tv, rettv);
|
|
|
073263 |
done = TRUE;
|
|
|
073263 |
}
|
|
|
073263 |
}
|
|
|
073263 |
|
|
|
073263 |
if (!done && argvars[2].v_type != VAR_UNKNOWN)
|
|
|
073263 |
--- 12084,12104 ----
|
|
|
073263 |
tp = find_tabpage((int)get_tv_number_chk(&argvars[0], NULL));
|
|
|
073263 |
if (tp != NULL && varname != NULL)
|
|
|
073263 |
{
|
|
|
073263 |
+ /* Set curwin to be our win, temporarily. Also set the tabpage,
|
|
|
073263 |
+ * otherwise the window is not valid. */
|
|
|
073263 |
+ switch_win(&oldcurwin, &oldtabpage, win, tp, TRUE);
|
|
|
073263 |
+
|
|
|
073263 |
/* look up the variable */
|
|
|
073263 |
! /* Let gettabvar({nr}, "") return the "t:" dictionary. */
|
|
|
073263 |
! v = find_var_in_ht(&tp->tp_vars->dv_hashtab, 't', varname, FALSE);
|
|
|
073263 |
if (v != NULL)
|
|
|
073263 |
{
|
|
|
073263 |
copy_tv(&v->di_tv, rettv);
|
|
|
073263 |
done = TRUE;
|
|
|
073263 |
}
|
|
|
073263 |
+
|
|
|
073263 |
+ /* restore previous notion of curwin */
|
|
|
073263 |
+ restore_win(oldcurwin, oldtabpage, TRUE);
|
|
|
073263 |
}
|
|
|
073263 |
|
|
|
073263 |
if (!done && argvars[2].v_type != VAR_UNKNOWN)
|
|
|
073263 |
*** ../vim-7.4.433/runtime/doc/eval.txt 2014-08-29 15:53:43.714453155 +0200
|
|
|
073263 |
--- runtime/doc/eval.txt 2014-09-09 16:00:31.776530049 +0200
|
|
|
073263 |
***************
|
|
|
073263 |
*** 3535,3540 ****
|
|
|
073263 |
--- 3576,3583 ----
|
|
|
073263 |
Get the value of a tab-local variable {varname} in tab page
|
|
|
073263 |
{tabnr}. |t:var|
|
|
|
073263 |
Tabs are numbered starting with one.
|
|
|
073263 |
+ When {varname} is empty a dictionary with all tab-local
|
|
|
073263 |
+ variables is returned.
|
|
|
073263 |
Note that the name without "t:" must be used.
|
|
|
073263 |
When the tab or variable doesn't exist {def} or an empty
|
|
|
073263 |
string is returned, there is no error message.
|
|
|
073263 |
*** ../vim-7.4.433/src/testdir/test91.in 2013-07-24 14:53:47.000000000 +0200
|
|
|
073263 |
--- src/testdir/test91.in 2014-09-09 16:08:40.116531116 +0200
|
|
|
073263 |
***************
|
|
|
073263 |
*** 55,60 ****
|
|
|
073263 |
--- 55,61 ----
|
|
|
073263 |
:tabnew
|
|
|
073263 |
:tabnew
|
|
|
073263 |
:let t:var_list = [1, 2, 3]
|
|
|
073263 |
+ :let t:other = 777
|
|
|
073263 |
:let def_list = [4, 5, 6, 7]
|
|
|
073263 |
:tabrewind
|
|
|
073263 |
:$put =string(gettabvar(3, 'var_list'))
|
|
|
073263 |
*** ../vim-7.4.433/src/testdir/test91.ok 2013-07-24 14:52:47.000000000 +0200
|
|
|
073263 |
--- src/testdir/test91.ok 2014-09-09 16:09:27.624531220 +0200
|
|
|
073263 |
***************
|
|
|
073263 |
*** 26,33 ****
|
|
|
073263 |
0
|
|
|
073263 |
[1, 2, 3]
|
|
|
073263 |
[1, 2, 3]
|
|
|
073263 |
! ''
|
|
|
073263 |
! [4, 5, 6, 7]
|
|
|
073263 |
[4, 5, 6, 7]
|
|
|
073263 |
''
|
|
|
073263 |
[4, 5, 6, 7]
|
|
|
073263 |
--- 26,33 ----
|
|
|
073263 |
0
|
|
|
073263 |
[1, 2, 3]
|
|
|
073263 |
[1, 2, 3]
|
|
|
073263 |
! {'var_list': [1, 2, 3], 'other': 777}
|
|
|
073263 |
! {'var_list': [1, 2, 3], 'other': 777}
|
|
|
073263 |
[4, 5, 6, 7]
|
|
|
073263 |
''
|
|
|
073263 |
[4, 5, 6, 7]
|
|
|
073263 |
*** ../vim-7.4.433/src/version.c 2014-09-09 13:52:55.028513324 +0200
|
|
|
073263 |
--- src/version.c 2014-09-09 16:09:17.824531199 +0200
|
|
|
073263 |
***************
|
|
|
073263 |
*** 743,744 ****
|
|
|
073263 |
--- 743,746 ----
|
|
|
073263 |
{ /* Add new patch number below this line */
|
|
|
073263 |
+ /**/
|
|
|
073263 |
+ 434,
|
|
|
073263 |
/**/
|
|
|
073263 |
|
|
|
073263 |
--
|
|
|
073263 |
hundred-and-one symptoms of being an internet addict:
|
|
|
073263 |
108. While reading a magazine, you look for the Zoom icon for a better
|
|
|
073263 |
look at a photograph.
|
|
|
073263 |
|
|
|
073263 |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
073263 |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
073263 |
\\\ an exciting new programming language -- http://www.Zimbu.org ///
|
|
|
073263 |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|