From b47fbb40837512cdd2d8c25eaf9952154836b99d Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Mon, 12 Feb 2024 22:50:26 +0100 Subject: patch 9.1.0102: settabvar() may change the last accessed tabpage Problem: settabvar() may change the last accessed tabpage. Solution: Save and restore lastused_tabpage. (zeertzjq) closes: #14017 Signed-off-by: zeertzjq Signed-off-by: Christian Brabandt --- src/evalvars.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src/evalvars.c') diff --git a/src/evalvars.c b/src/evalvars.c index 0a84afdaaf..856e475118 100644 --- a/src/evalvars.c +++ b/src/evalvars.c @@ -4843,6 +4843,7 @@ f_settabvar(typval_T *argvars, typval_T *rettv UNUSED) { tabpage_T *save_curtab; tabpage_T *tp; + tabpage_T *save_lu_tp; char_u *varname, *tabvarname; typval_T *varp; @@ -4862,6 +4863,7 @@ f_settabvar(typval_T *argvars, typval_T *rettv UNUSED) return; save_curtab = curtab; + save_lu_tp = lastused_tabpage; goto_tabpage_tp(tp, FALSE, FALSE); tabvarname = alloc(STRLEN(varname) + 3); @@ -4873,9 +4875,13 @@ f_settabvar(typval_T *argvars, typval_T *rettv UNUSED) vim_free(tabvarname); } - // Restore current tabpage + // Restore current tabpage and last accessed tabpage. if (valid_tabpage(save_curtab)) + { goto_tabpage_tp(save_curtab, FALSE, FALSE); + if (valid_tabpage(save_lu_tp)) + lastused_tabpage = save_lu_tp; + } } /* -- cgit v1.2.3