Mercurial > vim
changeset 34338:1451ee5fbe21 v9.1.0102
patch 9.1.0102: settabvar() may change the last accessed tabpage
Commit: https://github.com/vim/vim/commit/b47fbb40837512cdd2d8c25eaf9952154836b99d
Author: zeertzjq <zeertzjq@outlook.com>
Date: Mon Feb 12 22:50:26 2024 +0100
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 <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Mon, 12 Feb 2024 23:00:04 +0100 |
| parents | 0cd7d2ff5f4d |
| children | 5ba16a528a88 |
| files | src/evalvars.c src/testdir/test_tabpage.vim src/version.c |
| diffstat | 3 files changed, 26 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/evalvars.c +++ b/src/evalvars.c @@ -4843,6 +4843,7 @@ f_settabvar(typval_T *argvars, typval_T { 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 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 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; + } } /*
--- 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