diff options
| author | Sean Dewar <6256228+seandewar@users.noreply.github.com> | 2024-02-22 19:53:33 +0100 |
|---|---|---|
| committer | Christian Brabandt <cb@256bit.org> | 2024-02-22 19:53:33 +0100 |
| commit | 2a65e739447949a7aee966ce8a3b75521b2a79ea (patch) | |
| tree | 5d539accc41476eb1890ea81cf6728bffb545e64 | |
| parent | 5e3674b42da10b7e7c72d1f20f9a15379af1b60a (diff) | |
patch 9.1.0128: win_gotoid() may abort even when not switching a windowv9.1.0128
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>
| -rw-r--r-- | src/evalwindow.c | 7 | ||||
| -rw-r--r-- | src/testdir/test_window_cmd.vim | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 15 insertions, 0 deletions
diff --git a/src/evalwindow.c b/src/evalwindow.c index 00081d43d5..f9b1c12961 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 a68ed74cb6..a70fb790c5 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 e2d1f591ab..9b38a34964 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 */ /**/ + 128, +/**/ 127, /**/ 126, |