@@ -112,7 +112,9 @@ static char *e_dictrange = N_("E719: Cannot use [:] with a Dictionary");
112112static char *e_letwrong = N_("E734: Wrong variable type for %s=");
113113static char *e_nofunc = N_("E130: Unknown function: %s");
114114static char *e_illvar = N_("E461: Illegal variable name: %s");
115+ #ifdef FEAT_FLOAT
115116static char *e_float_as_string = N_("E806: using Float as a String");
117+ #endif
116118
117119static dictitem_T globvars_var; /* variable used for g: */
118120#define globvarht globvardict.dv_hashtab
@@ -11882,7 +11884,7 @@ f_getwinposy(argvars, rettv)
1188211884 static win_T *
1188311885find_win_by_nr(vp, tp)
1188411886 typval_T *vp;
11885- tabpage_T *tp; /* NULL for current tab page */
11887+ tabpage_T *tp UNUSED; /* NULL for current tab page */
1188611888{
1188711889#ifdef FEAT_WINDOWS
1188811890 win_T *wp;
@@ -11932,7 +11934,8 @@ getwinvar(argvars, rettv, off)
1193211934 win_T *win, *oldcurwin;
1193311935 char_u *varname;
1193411936 dictitem_T *v;
11935- tabpage_T *tp, *oldtabpage;
11937+ tabpage_T *tp = NULL;
11938+ tabpage_T *oldtabpage;
1193611939 int done = FALSE;
1193711940
1193811941#ifdef FEAT_WINDOWS
@@ -16683,24 +16686,34 @@ f_settabvar(argvars, rettv)
1668316686 typval_T *argvars;
1668416687 typval_T *rettv;
1668516688{
16689+ #ifdef FEAT_WINDOWS
1668616690 tabpage_T *save_curtab;
16691+ tabpage_T *tp;
16692+ #endif
1668716693 char_u *varname, *tabvarname;
1668816694 typval_T *varp;
16689- tabpage_T *tp;
1669016695
1669116696 rettv->vval.v_number = 0;
1669216697
1669316698 if (check_restricted() || check_secure())
1669416699 return;
1669516700
16701+ #ifdef FEAT_WINDOWS
1669616702 tp = find_tabpage((int)get_tv_number_chk(&argvars[0], NULL));
16703+ #endif
1669716704 varname = get_tv_string_chk(&argvars[1]);
1669816705 varp = &argvars[2];
1669916706
16700- if (tp != NULL && varname != NULL && varp != NULL)
16707+ if (varname != NULL && varp != NULL
16708+ #ifdef FEAT_WINDOWS
16709+ && tp != NULL
16710+ #endif
16711+ )
1670116712 {
16713+ #ifdef FEAT_WINDOWS
1670216714 save_curtab = curtab;
1670316715 goto_tabpage_tp(tp, FALSE, FALSE);
16716+ #endif
1670416717
1670516718 tabvarname = alloc((unsigned)STRLEN(varname) + 3);
1670616719 if (tabvarname != NULL)
@@ -16711,9 +16724,11 @@ f_settabvar(argvars, rettv)
1671116724 vim_free(tabvarname);
1671216725 }
1671316726
16727+ #ifdef FEAT_WINDOWS
1671416728 /* Restore current tabpage */
1671516729 if (valid_tabpage(save_curtab))
1671616730 goto_tabpage_tp(save_curtab, FALSE, FALSE);
16731+ #endif
1671716732 }
1671816733}
1671916734
@@ -16757,7 +16772,7 @@ setwinvar(argvars, rettv, off)
1675716772 char_u *varname, *winvarname;
1675816773 typval_T *varp;
1675916774 char_u nbuf[NUMBUFLEN];
16760- tabpage_T *tp;
16775+ tabpage_T *tp = NULL ;
1676116776
1676216777 if (check_restricted() || check_secure())
1676316778 return;
0 commit comments