diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2019-05-06 23:10:16 +0200 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2019-05-06 23:10:16 +0200 |
| commit | d83a7dc68732414c013bdf7458b16b95885c6ebd (patch) | |
| tree | 26f4bb785c001bc6d13f0ec5ba77ff3a13e9f6d7 /src/nvim/window.c | |
| parent | df9059d1a8d01df114bd6ed74fd3be1400f8f0af (diff) | |
| parent | b0e3b5cf2e1237aa9071f8ff73899877f1c0d56d (diff) | |
| download | rneovim-d83a7dc68732414c013bdf7458b16b95885c6ebd.tar.gz rneovim-d83a7dc68732414c013bdf7458b16b95885c6ebd.tar.bz2 rneovim-d83a7dc68732414c013bdf7458b16b95885c6ebd.zip | |
Merge #9798 'aucmd_prepbuf: Use floating window'
Diffstat (limited to 'src/nvim/window.c')
| -rw-r--r-- | src/nvim/window.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/nvim/window.c b/src/nvim/window.c index c6270d6c76..e737bfbd05 100644 --- a/src/nvim/window.c +++ b/src/nvim/window.c @@ -2295,8 +2295,7 @@ int win_close(win_T *win, bool free_buf) EMSG(_("E813: Cannot close autocmd window")); return FAIL; } - if ((firstwin == aucmd_win || lastwin_nofloating() == aucmd_win) - && one_window()) { + if ((firstwin == aucmd_win || lastwin == aucmd_win) && one_window()) { EMSG(_("E814: Cannot close window, only autocmd window would remain")); return FAIL; } @@ -3413,16 +3412,18 @@ int win_alloc_first(void) return OK; } -/* - * Init "aucmd_win". This can only be done after the first - * window is fully initialized, thus it can't be in win_alloc_first(). - */ +// Init `aucmd_win`. This can only be done after the first window +// is fully initialized, thus it can't be in win_alloc_first(). void win_alloc_aucmd_win(void) { - aucmd_win = win_alloc(NULL, TRUE); - win_init_some(aucmd_win, curwin); + Error err = ERROR_INIT; + FloatConfig fconfig = FLOAT_CONFIG_INIT; + fconfig.width = 20; + fconfig.height = 20; + fconfig.focusable = false; + aucmd_win = win_new_float(NULL, fconfig, &err); + aucmd_win->w_buffer->b_nwindows--; RESET_BINDING(aucmd_win); - new_frame(aucmd_win); } /* |