Mercurial > vim
diff src/window.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 | ce04ebdf26b8 |
children | 2b00163053cd |
line wrap: on
line diff
--- a/src/window.c +++ b/src/window.c @@ -6495,6 +6495,20 @@ switch_win( int no_display) { block_autocmds(); + return switch_win_noblock(save_curwin, save_curtab, win, tp, no_display); +} + +/* + * As switch_win() but without blocking autocommands. + */ + int +switch_win_noblock( + win_T **save_curwin, + tabpage_T **save_curtab, + win_T *win, + tabpage_T *tp, + int no_display) +{ *save_curwin = curwin; if (tp != NULL) { @@ -6524,9 +6538,22 @@ switch_win( */ void restore_win( - win_T *save_curwin UNUSED, - tabpage_T *save_curtab UNUSED, - int no_display UNUSED) + win_T *save_curwin, + tabpage_T *save_curtab, + int no_display) +{ + restore_win_noblock(save_curwin, save_curtab, no_display); + unblock_autocmds(); +} + +/* + * As restore_win() but without unblocking autocommands. + */ + void +restore_win_noblock( + win_T *save_curwin, + tabpage_T *save_curtab, + int no_display) { if (save_curtab != NULL && valid_tabpage(save_curtab)) { @@ -6546,7 +6573,6 @@ restore_win( curwin = save_curwin; curbuf = curwin->w_buffer; } - unblock_autocmds(); } /*