patch 8.2.0743: can move to another buffer from a terminal in popup window
Problem: Can move to another buffer from a terminal in popup window.
Solution: Do not allow "gf" or editing a file. (closes #6072)
diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index f38bdac..9c55de3 100644
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -2484,6 +2484,11 @@
int did_inc_redrawing_disabled = FALSE;
long *so_ptr = curwin->w_p_so >= 0 ? &curwin->w_p_so : &p_so;
+#ifdef FEAT_PROP_POPUP
+ if (ERROR_IF_TERM_POPUP_WINDOW)
+ return FAIL;
+#endif
+
if (eap != NULL)
command = eap->do_ecmd_cmd;
set_bufref(&old_curbuf, curbuf);
diff --git a/src/normal.c b/src/normal.c
index 7dd74a4..690bb00 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -4169,6 +4169,10 @@
clearop(cap->oap);
return;
}
+#ifdef FEAT_PROP_POPUP
+ if (ERROR_IF_TERM_POPUP_WINDOW)
+ return;
+#endif
ptr = grab_file_name(cap->count1, &lnum);
diff --git a/src/testdir/test_popupwin.vim b/src/testdir/test_popupwin.vim
index 99b4458..5eecb19 100644
--- a/src/testdir/test_popupwin.vim
+++ b/src/testdir/test_popupwin.vim
@@ -2425,8 +2425,16 @@
call assert_equal(winnr(), winnr('k'))
call assert_equal(winnr(), winnr('h'))
call assert_equal(winnr(), winnr('l'))
+
" Cannot quit while job is running
call assert_fails('call feedkeys("\<C-W>:quit\<CR>", "xt")', 'E948:')
+
+ " Cannot enter Terminal-Normal mode.
+ call feedkeys("xxx\<C-W>N", 'xt')
+ call assert_fails('call feedkeys("gf", "xt")', 'E863:')
+ call feedkeys("a\<C-U>", 'xt')
+
+ " Exiting shell closes popup window
call feedkeys("exit\<CR>", 'xt')
" Wait for shell to exit
sleep 100m
diff --git a/src/version.c b/src/version.c
index 41f857f..1ce64b7 100644
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 743,
+/**/
742,
/**/
741,