diff options
| author | Sean Dewar <seandewar@users.noreply.github.com> | 2022-01-08 12:27:35 +0000 |
|---|---|---|
| committer | Sean Dewar <seandewar@users.noreply.github.com> | 2022-02-03 15:03:08 +0000 |
| commit | 452b46fcf79de52317e2c41adb083d461a93ace5 (patch) | |
| tree | 78afdbf98bb5e265f5a17f9551d77b17f677264f /src/nvim/api/window.c | |
| parent | 6820420d3e7c153868e21d917596b3d1a19fa937 (diff) | |
| download | rneovim-452b46fcf79de52317e2c41adb083d461a93ace5.tar.gz rneovim-452b46fcf79de52317e2c41adb083d461a93ace5.tar.bz2 rneovim-452b46fcf79de52317e2c41adb083d461a93ace5.zip | |
fix(api/nvim_win_call): share common win_execute logic
We have to be sure that the bugs fixed in the previous patches also apply to
nvim_win_call.
Checking v8.1.2124 and v8.2.4026 is especially important as these patches were
only applied to win_execute, but nvim_win_call is also affected by the same
bugs. A lot of win_execute's logic can be shared with nvim_win_call, so factor
it out into a common macro to reduce the possibility of this happening again.
Diffstat (limited to 'src/nvim/api/window.c')
| -rw-r--r-- | src/nvim/api/window.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/nvim/api/window.c b/src/nvim/api/window.c index a762673fbf..9fd4de4bb2 100644 --- a/src/nvim/api/window.c +++ b/src/nvim/api/window.c @@ -457,12 +457,10 @@ Object nvim_win_call(Window window, LuaRef fun, Error *err) try_start(); Object res = OBJECT_INIT; - switchwin_T switchwin; - if (switch_win_noblock(&switchwin, win, tabpage, true) == OK) { + WIN_EXECUTE(win, tabpage, { Array args = ARRAY_DICT_INIT; res = nlua_call_ref(fun, NULL, args, true, err); - } - restore_win_noblock(&switchwin, true); + }); try_end(err); return res; } |