Mercurial > vim
comparison src/window.c @ 19265:ce8c47ed54e5 v8.2.0191
patch 8.2.0191: cannot put a terminal in a popup window
Commit: https://github.com/vim/vim/commit/219c7d063823498be22aae46dd024d77b5fb2a58
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Feb 1 21:57:29 2020 +0100
patch 8.2.0191: cannot put a terminal in a popup window
Problem: Cannot put a terminal in a popup window.
Solution: Allow opening a terminal in a popup window. It will always have
keyboard focus until closed.
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Sat, 01 Feb 2020 22:00:04 +0100 |
parents | 215793f6b59d |
children | ebeeb4b4a1fa |
comparison
equal
deleted
inserted
replaced
19264:489e4c8101ba | 19265:ce8c47ed54e5 |
---|---|
4342 #ifdef FEAT_CONCEAL | 4342 #ifdef FEAT_CONCEAL |
4343 win_T *owp = curwin; | 4343 win_T *owp = curwin; |
4344 #endif | 4344 #endif |
4345 | 4345 |
4346 #ifdef FEAT_PROP_POPUP | 4346 #ifdef FEAT_PROP_POPUP |
4347 if (ERROR_IF_POPUP_WINDOW) | 4347 if (ERROR_IF_POPUP_WINDOW || ERROR_IF_TERM_POPUP_WINDOW) |
4348 return; | 4348 return; |
4349 if (popup_is_popup(wp)) | 4349 if (popup_is_popup(wp)) |
4350 { | 4350 { |
4351 emsg(_("E366: Not allowed to enter a popup window")); | 4351 emsg(_("E366: Not allowed to enter a popup window")); |
4352 return; | 4352 return; |
4484 int up, // TRUE to go to win above | 4484 int up, // TRUE to go to win above |
4485 long count) | 4485 long count) |
4486 { | 4486 { |
4487 win_T *win; | 4487 win_T *win; |
4488 | 4488 |
4489 #ifdef FEAT_PROP_POPUP | |
4490 if (ERROR_IF_TERM_POPUP_WINDOW) | |
4491 return; | |
4492 #endif | |
4489 win = win_vert_neighbor(curtab, curwin, up, count); | 4493 win = win_vert_neighbor(curtab, curwin, up, count); |
4490 if (win != NULL) | 4494 if (win != NULL) |
4491 win_goto(win); | 4495 win_goto(win); |
4492 } | 4496 } |
4493 | 4497 |
4562 int left, // TRUE to go to left win | 4566 int left, // TRUE to go to left win |
4563 long count) | 4567 long count) |
4564 { | 4568 { |
4565 win_T *win; | 4569 win_T *win; |
4566 | 4570 |
4571 #ifdef FEAT_PROP_POPUP | |
4572 if (ERROR_IF_TERM_POPUP_WINDOW) | |
4573 return; | |
4574 #endif | |
4567 win = win_horz_neighbor(curtab, curwin, left, count); | 4575 win = win_horz_neighbor(curtab, curwin, left, count); |
4568 if (win != NULL) | 4576 if (win != NULL) |
4569 win_goto(win); | 4577 win_goto(win); |
4570 } | 4578 } |
4571 | 4579 |