diff options
| author | Sean Dewar <seandewar@users.noreply.github.com> | 2022-02-03 16:44:42 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-03 16:44:42 +0000 |
| commit | 9efdd927ff50f22e623133976ddd57538f9cd491 (patch) | |
| tree | 78afdbf98bb5e265f5a17f9551d77b17f677264f /src/nvim/api/window.c | |
| parent | f5c4c1d7684d9d39dd469e10322ce6a5df5c3281 (diff) | |
| parent | 452b46fcf79de52317e2c41adb083d461a93ace5 (diff) | |
| download | rneovim-9efdd927ff50f22e623133976ddd57538f9cd491.tar.gz rneovim-9efdd927ff50f22e623133976ddd57538f9cd491.tar.bz2 rneovim-9efdd927ff50f22e623133976ddd57538f9cd491.zip | |
Merge pull request #16976 from seandewar/vim-8.2.4018
vim-patch:8.2.{4018,4026,4028} & `nvim_win_call` fixes
Diffstat (limited to 'src/nvim/api/window.c')
| -rw-r--r-- | src/nvim/api/window.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/nvim/api/window.c b/src/nvim/api/window.c index 907306da7b..9fd4de4bb2 100644 --- a/src/nvim/api/window.c +++ b/src/nvim/api/window.c @@ -455,17 +455,12 @@ Object nvim_win_call(Window window, LuaRef fun, Error *err) } tabpage_T *tabpage = win_find_tabpage(win); - win_T *save_curwin; - tabpage_T *save_curtab; - try_start(); Object res = OBJECT_INIT; - if (switch_win_noblock(&save_curwin, &save_curtab, 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(save_curwin, save_curtab, true); + }); try_end(err); return res; } |