mirror of
https://github.com/vim/vim.git
synced 2025-09-25 03:54:15 -04:00
patch 8.2.1807: can use :help in a terminal popup window
Problem: Can use :help in a terminal popup window. Solution: Give an error. (closes #7088)
This commit is contained in:
@@ -39,6 +39,9 @@ ex_help(exarg_T *eap)
|
|||||||
int old_KeyTyped = KeyTyped;
|
int old_KeyTyped = KeyTyped;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
if (ERROR_IF_ANY_POPUP_WINDOW)
|
||||||
|
return;
|
||||||
|
|
||||||
if (eap != NULL)
|
if (eap != NULL)
|
||||||
{
|
{
|
||||||
// A ":help" command ends at the first LF, or at a '|' that is
|
// A ":help" command ends at the first LF, or at a '|' that is
|
||||||
|
@@ -2645,6 +2645,10 @@ func Test_popupwin_terminal_buffer()
|
|||||||
let g:test_is_flaky = 1
|
let g:test_is_flaky = 1
|
||||||
|
|
||||||
let origwin = win_getid()
|
let origwin = win_getid()
|
||||||
|
|
||||||
|
" open help window to test that :help below fails
|
||||||
|
help
|
||||||
|
|
||||||
let termbuf = term_start(&shell, #{hidden: 1})
|
let termbuf = term_start(&shell, #{hidden: 1})
|
||||||
let winid = popup_create(termbuf, #{minwidth: 40, minheight: 10})
|
let winid = popup_create(termbuf, #{minwidth: 40, minheight: 10})
|
||||||
" Wait for shell to start
|
" Wait for shell to start
|
||||||
@@ -2666,6 +2670,7 @@ func Test_popupwin_terminal_buffer()
|
|||||||
|
|
||||||
" Cannot escape from terminal window
|
" Cannot escape from terminal window
|
||||||
call assert_fails('tab drop xxx', 'E863:')
|
call assert_fails('tab drop xxx', 'E863:')
|
||||||
|
call assert_fails('help', 'E994:')
|
||||||
|
|
||||||
" Cannot open a second one.
|
" Cannot open a second one.
|
||||||
let termbuf2 = term_start(&shell, #{hidden: 1})
|
let termbuf2 = term_start(&shell, #{hidden: 1})
|
||||||
@@ -2677,6 +2682,7 @@ func Test_popupwin_terminal_buffer()
|
|||||||
" Wait for shell to exit
|
" Wait for shell to exit
|
||||||
call WaitForAssert({-> assert_equal("dead", job_status(term_getjob(termbuf)))})
|
call WaitForAssert({-> assert_equal("dead", job_status(term_getjob(termbuf)))})
|
||||||
|
|
||||||
|
helpclose
|
||||||
call feedkeys(":quit\<CR>", 'xt')
|
call feedkeys(":quit\<CR>", 'xt')
|
||||||
call assert_equal(origwin, win_getid())
|
call assert_equal(origwin, win_getid())
|
||||||
endfunc
|
endfunc
|
||||||
|
@@ -750,6 +750,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
1807,
|
||||||
/**/
|
/**/
|
||||||
1806,
|
1806,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user