aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/eval/funcs.c
diff options
context:
space:
mode:
authorjing <lhchenjw@gmail.com>2021-05-01 10:21:14 +0800
committerjing <lhchenjw@gmail.com>2021-05-06 23:45:16 +0800
commit73154bbae033513a937af8092320920a49684ce6 (patch)
tree1dcbc6bef8b2f6988586c42ff6ec68a1bb773116 /src/nvim/eval/funcs.c
parent3c00252248daf54c5ba4ef2c983256cf81c71ded (diff)
downloadrneovim-73154bbae033513a937af8092320920a49684ce6.tar.gz
rneovim-73154bbae033513a937af8092320920a49684ce6.tar.bz2
rneovim-73154bbae033513a937af8092320920a49684ce6.zip
vim-patch:8.1.1832: win_execute() does not work in other tab
Problem: Win_execute() does not work in other tab. (Rick Howe) Solution: Take care of the tab. (closes vim/vim#4792) https://github.com/vim/vim/commit/820680b9ff1de8699156c7b060f97e5c0b87ad15
Diffstat (limited to 'src/nvim/eval/funcs.c')
-rw-r--r--src/nvim/eval/funcs.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/nvim/eval/funcs.c b/src/nvim/eval/funcs.c
index 3a202759b6..0b50f41de3 100644
--- a/src/nvim/eval/funcs.c
+++ b/src/nvim/eval/funcs.c
@@ -2041,12 +2041,13 @@ static void f_execute(typval_T *argvars, typval_T *rettv, FunPtr fptr)
// "win_execute(win_id, command)" function
static void f_win_execute(typval_T *argvars, typval_T *rettv, FunPtr fptr)
{
- win_T *wp = win_id2wp(argvars);
+ tabpage_T *tp;
+ win_T *wp = win_id2wp_tp(argvars, &tp);
win_T *save_curwin;
tabpage_T *save_curtab;
- if (wp != NULL) {
- if (switch_win_noblock(&save_curwin, &save_curtab, wp, curtab, true) ==
+ if (wp != NULL && tp != NULL) {
+ if (switch_win_noblock(&save_curwin, &save_curtab, wp, tp, true) ==
OK) {
check_cursor();
execute_common(argvars, rettv, fptr, 1);