thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 9.1.0169: current window number returned by tabpagewinnr may be outdated

Browse Source 
Problem:  current window number returned by tabpagewinnr may be outdated
          when called from win_execute for the original tabpage.
Solution: update the original tabpage's tp_curwin in switch_win; use
          {un}use_tabpage instead. Don't do it in restore_win to ensure
          tp_curwin of the temporarily visited tabpage is unchanged from
          switch_win visiting it, as before. (Sean Dewar)

Maybe restore_win should only restore tp_curwin if
`curtab == switchwin->sw_curtab`, in case the user changed tabpages from within
win_execute, but not doing that is consistent with the old behaviour.

related: #14186

Signed-off-by: Sean Dewar <6256228+seandewar@users.noreply.github.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Sean Dewar
2024-03-12 20:42:25 +01:00
committed by Christian Brabandt
parent bfcc895482
commit e101028a5c
3 changed files with 34 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/evalwindow.c
View File

@@ -1351,13 +1351,8 @@ switch_win_noblock(
switchwin->sw_curtab = curtab;
if (no_display)
{
curtab->tp_firstwin = firstwin;
curtab->tp_lastwin = lastwin;
curtab->tp_topframe = topframe;
curtab = tp;
firstwin = curtab->tp_firstwin;
lastwin = curtab->tp_lastwin;
topframe = curtab->tp_topframe;
unuse_tabpage(curtab);
use_tabpage(tp);
}
else
goto_tabpage_tp(tp, FALSE, FALSE);
@@ -1395,13 +1390,12 @@ restore_win_noblock(
{
if (no_display)
{
curtab->tp_firstwin = firstwin;
curtab->tp_lastwin = lastwin;
curtab->tp_topframe = topframe;
curtab = switchwin->sw_curtab;
firstwin = curtab->tp_firstwin;
lastwin = curtab->tp_lastwin;
topframe = curtab->tp_topframe;
win_T *old_tp_curwin = curtab->tp_curwin;
unuse_tabpage(curtab);
// Don't change the curwin of the tabpage we temporarily visited.
curtab->tp_curwin = old_tp_curwin;
use_tabpage(switchwin->sw_curtab);
}
else
goto_tabpage_tp(switchwin->sw_curtab, FALSE, FALSE);

24
src/testdir/test_execute_func.vim
View File

@@ -204,4 +204,28 @@ func Test_execute_func_with_null()
endif
endfunc
func Test_win_execute_tabpagewinnr()
belowright split
tab split
belowright split
call assert_equal(2, tabpagewinnr(1))
tabprevious
wincmd p
call assert_equal(1, tabpagenr())
call assert_equal(1, tabpagewinnr(1))
call assert_equal(2, tabpagewinnr(2))
call win_execute(win_getid(1, 2),
\ 'call assert_equal(2, tabpagenr())'
\ .. '| call assert_equal(1, tabpagewinnr(1))'
\ .. '| call assert_equal(1, tabpagewinnr(2))')
call assert_equal(1, tabpagenr())
call assert_equal(1, tabpagewinnr(1))
call assert_equal(2, tabpagewinnr(2))
%bwipe!
endfunc
" vim: shiftwidth=2 sts=2 expandtab

2
src/version.c
View File

@@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
169,
/**/
168,
/**/