patch 7.4.834

Problem:    gettabvar() doesn't work after Vim start. (Szymon Wrozynski)
Solution:   Handle first window in tab still being NULL. (Christian Brabandt)

diff --git a/src/eval.c b/src/eval.c
index fe0a66add3f64b9f7ceaf83ff895d352747a443c..e2f40f0bce9e5a1e7cf580159ac5d330ab6e46f9 100644 (file)
--- a/src/eval.c
+++ b/src/eval.c
@@ -12291,7 +12291,8 @@ f_gettabvar(argvars, rettv)
     {
        /* Set tp to be our tabpage, temporarily.  Also set the window to the
         * first window in the tabpage, otherwise the window is not valid. */
-       if (switch_win(&oldcurwin, &oldtabpage, tp->tp_firstwin, tp, TRUE)
+       if (switch_win(&oldcurwin, &oldtabpage,
+                   tp->tp_firstwin == NULL ? firstwin : tp->tp_firstwin, tp, TRUE)
                                                                        == OK)
        {
            /* look up the variable */

diff --git a/src/testdir/test91.in b/src/testdir/test91.in
index b66776b1e45fcd6dd3175a456f1b47cb5d849f18..e1365cb74fe0a0048ee23e88c020da15e82204bb 100644 (file)
--- a/src/testdir/test91.in
+++ b/src/testdir/test91.in
@@ -5,8 +5,12 @@ STARTTEST
 :so small.vim
 :so mbyte.vim
 :"
-:" Test for getbufvar()
 :" Use strings to test for memory leaks.
+:" First, check that in an empty window, gettabvar() returns the correct value
+:let t:testvar='abcd'
+:$put =string(gettabvar(1,'testvar'))
+:$put =string(gettabvar(1,'testvar'))
+:" Test for getbufvar()
 :let b:var_num = '1234'
 :let def_num = '5678'
 :$put =string(getbufvar(1, 'var_num'))

diff --git a/src/testdir/test91.ok b/src/testdir/test91.ok
index 809952b69d9d983073a94effe76e93c404887513..62adec10eaf0bd814f74029ba693488749d4d20b 100644 (file)
--- a/src/testdir/test91.ok
+++ b/src/testdir/test91.ok
@@ -1,4 +1,6 @@
 start:
+'abcd'
+'abcd'
 '1234'
 '1234'
 {'var_num': '1234'}

diff --git a/src/version.c b/src/version.c
index 0319edb60cb745d5ada7bbc0571f832a57b6ffc6..3e46e0fddc7112e72f660216db2dd7fe6b9f296c 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    834,
 /**/
     833,
 /**/