aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.2.0834: :drop command in terminal popup causes problems

Browse Source 
Problem:    :drop command in terminal popup causes problems.
Solution:   Check for using a popup window. (closes #6151)
This commit is contained in:
Bram Moolenaar 2020-05-27 23:15:16 +02:00
parent ca5bc74607
commit 3f65c66df9
3 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/ex_cmds.c
View File

@ -6349,6 +6349,9 @@ ex_drop(exarg_T *eap)
buf_T *buf; buf_T *buf;
tabpage_T *tp; tabpage_T *tp;
if (ERROR_IF_POPUP_WINDOW || ERROR_IF_TERM_POPUP_WINDOW)
return;
/* /*
* Check if the first argument is already being edited in a window. If * Check if the first argument is already being edited in a window. If
* so, jump to that window. * so, jump to that window.

3
src/testdir/test_popupwin.vim
View File

@ -2445,6 +2445,9 @@ func Test_popupwin_terminal_buffer()
call assert_fails('call feedkeys("gf", "xt")', 'E863:') call assert_fails('call feedkeys("gf", "xt")', 'E863:')
call feedkeys("a\<C-U>", 'xt') call feedkeys("a\<C-U>", 'xt')
" Cannot escape from terminal window
call assert_fails('tab drop xxx', 'E863:')
" Cannot open a second one. " Cannot open a second one.
let termbuf2 = term_start(&shell, #{hidden: 1}) let termbuf2 = term_start(&shell, #{hidden: 1})
call assert_fails('call popup_create(termbuf2, #{})', 'E861:') call assert_fails('call popup_create(termbuf2, #{})', 'E861:')

2
src/version.c
View File

@ -746,6 +746,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 */
/**/
834,
/**/ /**/
833, 833,
/**/ /**/