Mercurial > vim
diff src/evalfunc.c @ 16847:f8e28c6ae8ab v8.1.1425
patch 8.1.1425: win_execute() does not set window pointers properly
commit https://github.com/vim/vim/commit/89adc3a1371d211f7766f3dbc0975ecb2f862327
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu May 30 17:29:40 2019 +0200
patch 8.1.1425: win_execute() does not set window pointers properly
Problem: Win_execute() does not set window pointers properly.
Solution: Use switch_win_noblock(). Also execute autocommands in a popup
window.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Thu, 30 May 2019 17:30:06 +0200 |
| parents | cf630fab9fb6 |
| children | e6bcccccbf7b |
line wrap: on
line diff
--- a/src/evalfunc.c +++ b/src/evalfunc.c @@ -6116,19 +6116,18 @@ f_win_execute(typval_T *argvars, typval_ { int id = (int)tv_get_number(argvars); win_T *wp = win_id2wp(id); - win_T *save_curwin = curwin; + win_T *save_curwin; + tabpage_T *save_curtab; if (wp != NULL) { - curwin = wp; - curbuf = curwin->w_buffer; - check_cursor(); - execute_common(argvars, rettv, 1); - if (win_valid(save_curwin)) - { - curwin = save_curwin; - curbuf = curwin->w_buffer; - } + if (switch_win_noblock(&save_curwin, &save_curtab, wp, curtab, TRUE) + == OK) + { + check_cursor(); + execute_common(argvars, rettv, 1); + } + restore_win_noblock(save_curwin, save_curtab, TRUE); } }