diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2024-02-12 22:50:26 +0100 |
|---|---|---|
| committer | Christian Brabandt <cb@256bit.org> | 2024-02-12 22:50:26 +0100 |
| commit | b47fbb40837512cdd2d8c25eaf9952154836b99d (patch) | |
| tree | 061117c7cffb729024887ab621cdaf1de55b4795 | |
| parent | bd1232a1faf56b614a1e74c4ce51bc6e0650ae00 (diff) | |
patch 9.1.0102: settabvar() may change the last accessed tabpagev9.1.0102
Problem: settabvar() may change the last accessed tabpage.
Solution: Save and restore lastused_tabpage.
(zeertzjq)
closes: #14017
Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
| -rw-r--r-- | src/evalvars.c | 8 | ||||
| -rw-r--r-- | src/testdir/test_tabpage.vim | 17 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 26 insertions, 1 deletions
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; + } } /* diff --git a/src/testdir/test_tabpage.vim b/src/testdir/test_tabpage.vim index 94f695323f..a531f19334 100644 --- a/src/testdir/test_tabpage.vim +++ b/src/testdir/test_tabpage.vim @@ -993,4 +993,21 @@ func Test_tabpage_drop_tabmove() bwipe! endfunc +" Test that settabvar() shouldn't change the last accessed tabpage. +func Test_lastused_tabpage_settabvar() + tabonly! + tabnew + tabnew + tabnew + call assert_equal(3, tabpagenr('#')) + + call settabvar(2, 'myvar', 'tabval') + call assert_equal('tabval', gettabvar(2, 'myvar')) + call assert_equal(3, tabpagenr('#')) + + bwipe! + bwipe! + bwipe! +endfunc + " vim: shiftwidth=2 sts=2 expandtab diff --git a/src/version.c b/src/version.c index fec82525d5..e20b4270a8 100644 --- a/src/version.c +++ b/src/version.c @@ -705,6 +705,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 102, +/**/ 101, /**/ 100, |