aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 9.1.0128: win_gotoid() may abort even when not switching a window

Browse Source 
Problem:  win_gotoid() checks for textlock and other things when switching
          to a window that is already current (after v9.1.0119)
Solution: return early with success when attempting to switch to curwin
          (Sean Dewar)

Other potential causes of E565 from win_gotoid after v9.1.0119 should be
correct. Plugins can consider using win_execute() instead if they wish to
temporarily switch windows during textlock.

fixes: #14073
closes: #14074

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-02-22 19:53:33 +01:00 committed by Christian Brabandt
parent 5e3674b42d
commit 2a65e73944
No known key found for this signature in database
GPG Key ID: F3F92DA383FDDE09
3 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/evalwindow.c
View File

@ -824,6 +824,13 @@ f_win_gotoid(typval_T *argvars, typval_T *rettv)
return;
id = tv_get_number(&argvars[0]);
if (curwin->w_id == id)
{
// Nothing to do.
rettv->vval.v_number = 1;
return;
}
if (text_or_buf_locked())
return;
#if defined(FEAT_PROP_POPUP) && defined(FEAT_TERMINAL)

6
src/testdir/test_window_cmd.vim
View File

@ -2225,6 +2225,10 @@ func Test_win_gotoid_splitmove_textlock_cmdwin()
set debug+=throw indentexpr=win_gotoid(win_getid(winnr('#')))
call assert_fails('normal! ==', 'E565:')
call assert_equal(curwin, win_getid())
" No error if attempting to switch to curwin; nothing happens.
set indentexpr=assert_equal(1,win_gotoid(win_getid()))
normal! ==
call assert_equal(curwin, win_getid())
set indentexpr=win_splitmove(winnr('#'),winnr())
call assert_fails('normal! ==', 'E565:')
@ -2240,6 +2244,8 @@ func Test_win_gotoid_splitmove_textlock_cmdwin()
call feedkeys('q:'
\ .. ":call assert_fails('call win_gotoid(win_getid(winnr(''#'')))', 'E11:')\<CR>"
"\ No error if attempting to switch to curwin; nothing happens.
\ .. ":call assert_equal(1, win_gotoid(win_getid()))\<CR>"
\ .. ":call assert_equal('command', win_gettype())\<CR>"
\ .. ":call assert_equal('', win_gettype(winnr('#')))\<CR>", 'ntx')
endfunc

2
src/version.c
View File

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