# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1590615003 -7200
# Node ID 18c52f380193be48b41351269e0e05037ac82018
# Parent  4cb09af7ab7dc302842bfa260accaf6983bd78ba
patch 8.2.0834: :drop command in terminal popup causes problems

Commit: https://github.com/vim/vim/commit/3f65c66df95445ef84f98de007c9b70ce23f54a0
Author: Bram Moolenaar <Bram@vim.org>
Date:   Wed May 27 23:15:16 2020 +0200

    patch 8.2.0834: :drop command in terminal popup causes problems

    Problem:    :drop command in terminal popup causes problems.
    Solution:   Check for using a popup window. (closes https://github.com/vim/vim/issues/6151)

diff --git a/src/ex_cmds.c b/src/ex_cmds.c
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -6349,6 +6349,9 @@ ex_drop(exarg_T *eap)
     buf_T	*buf;
     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
      * so, jump to that window.
diff --git a/src/testdir/test_popupwin.vim b/src/testdir/test_popupwin.vim
--- a/src/testdir/test_popupwin.vim
+++ b/src/testdir/test_popupwin.vim
@@ -2445,6 +2445,9 @@ func Test_popupwin_terminal_buffer()
   call assert_fails('call feedkeys("gf", "xt")', 'E863:')
   call feedkeys("a\<C-U>", 'xt')
 
+  " Cannot escape from terminal window
+  call assert_fails('tab drop xxx', 'E863:')
+
   " Cannot open a second one.
   let termbuf2 = term_start(&shell, #{hidden: 1})
   call assert_fails('call popup_create(termbuf2, #{})', 'E861:')
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    834,
+/**/
     833,
 /**/
     832,