diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2021-05-07 08:34:28 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-07 08:34:28 -0400 |
| commit | 5165513198dbbe7415f1b8c51225ae8f822628ec (patch) | |
| tree | 3ed35d03f4a1c606ec33a18ee878d61138efbaf2 /src/nvim/api/window.c | |
| parent | 4be0e92db01a502863ac4bb26dd0fee16d833145 (diff) | |
| parent | 1def3d1542d6a65f057e743faea39a760b50db87 (diff) | |
| download | rneovim-5165513198dbbe7415f1b8c51225ae8f822628ec.tar.gz rneovim-5165513198dbbe7415f1b8c51225ae8f822628ec.tar.bz2 rneovim-5165513198dbbe7415f1b8c51225ae8f822628ec.zip | |
Merge pull request #13664 from ivechan/win_exectute
vim-patch:8.1.{1418,1425,1832,2124},8.2.{0137, 2340}
Diffstat (limited to 'src/nvim/api/window.c')
| -rw-r--r-- | src/nvim/api/window.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/api/window.c b/src/nvim/api/window.c index f942d6b19f..158e149628 100644 --- a/src/nvim/api/window.c +++ b/src/nvim/api/window.c @@ -54,7 +54,7 @@ void nvim_win_set_buf(Window window, Buffer buffer, Error *err) return; } - if (switch_win(&save_curwin, &save_curtab, win, tab, false) == FAIL) { + if (switch_win_noblock(&save_curwin, &save_curtab, win, tab, false) == FAIL) { api_set_error(err, kErrorTypeException, "Failed to switch to window %d", @@ -74,7 +74,7 @@ void nvim_win_set_buf(Window window, Buffer buffer, Error *err) // So do it now. validate_cursor(); - restore_win(save_curwin, save_curtab, false); + restore_win_noblock(save_curwin, save_curtab, false); } /// Gets the (1,0)-indexed cursor position in the window. |api-indexing| |