aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2021-05-31 21:57:44 -0400
committerGitHub <noreply@github.com>2021-05-31 21:57:44 -0400
commite8f0ff1d48f5e85c0e16f0a248ff1781d4d080b3 (patch)
tree296cdb07cad31467809e2c4b1b1479ec8dd4b143 /src
parent2a1bc8657a59a5af89a5ec2840a443c5a21e1c27 (diff)
parent7af26e51168445cb6675453684d74b0d1f74df67 (diff)
downloadrneovim-e8f0ff1d48f5e85c0e16f0a248ff1781d4d080b3.tar.gz
rneovim-e8f0ff1d48f5e85c0e16f0a248ff1781d4d080b3.tar.bz2
rneovim-e8f0ff1d48f5e85c0e16f0a248ff1781d4d080b3.zip
Merge pull request #14531 from janlazo/revert-noblock
Revert "api/window: use the "noblock" variants in nvim_win_set_buf"
Diffstat (limited to 'src')
-rw-r--r--src/nvim/api/window.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/api/window.c b/src/nvim/api/window.c
index 158e149628..f942d6b19f 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_noblock(&save_curwin, &save_curtab, win, tab, false) == FAIL) {
+ if (switch_win(&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_noblock(save_curwin, save_curtab, false);
+ restore_win(save_curwin, save_curtab, false);
}
/// Gets the (1,0)-indexed cursor position in the window. |api-indexing|