patch 9.1.0128: win_gotoid() may abort even when not switching a window Commit: https://github.com/vim/vim/commit/2a65e739447949a7aee966ce8a3b75521b2a79ea Author: Sean Dewar <6256228+seande...@users.noreply.github.com> Date: Thu Feb 22 19:53:33 2024 +0100
patch 9.1.0128: win_gotoid() may abort even when not switching a window 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+seande...@users.noreply.github.com> Signed-off-by: Christian Brabandt <c...@256bit.org> diff --git a/src/evalwindow.c b/src/evalwindow.c index 00081d43d..f9b1c1296 100644 --- a/src/evalwindow.c +++ b/src/evalwindow.c @@ -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) diff --git a/src/testdir/test_window_cmd.vim b/src/testdir/test_window_cmd.vim index a68ed74cb..a70fb790c 100644 --- a/src/testdir/test_window_cmd.vim +++ b/src/testdir/test_window_cmd.vim @@ -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 diff --git a/src/version.c b/src/version.c index e2d1f591a..9b38a3496 100644 --- a/src/version.c +++ b/src/version.c @@ -704,6 +704,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 128, /**/ 127, /**/ -- -- You received this message from the "vim_dev" maillist. Do not top-post! Type your reply below the text you are replying to. For more information, visit http://www.vim.org/maillist.php --- You received this message because you are subscribed to the Google Groups "vim_dev" group. To unsubscribe from this group and stop receiving emails from it, send an email to vim_dev+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/vim_dev/E1rdEIi-00Cwea-FK%40256bit.org.