patch 8.2.0367: can use :pedit in a popup window

Problem:    Can use :pedit in a popup window.
Solution:   Disallow it.

diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index f2fb646980b429494d768338495ff912602fed5e..58ea7c86388fb9be22095f3914ba348644b4b976 100644 (file)
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -7886,6 +7886,9 @@ ex_pedit(exarg_T *eap)
 {
     win_T      *curwin_save = curwin;
 
+    if (ERROR_IF_ANY_POPUP_WINDOW)
+       return;
+
     // Open the preview window or popup and make it the current window.
     g_do_tagpreview = p_pvh;
     prepare_tagpreview(TRUE, TRUE, FALSE);

diff --git a/src/testdir/test_popupwin.vim b/src/testdir/test_popupwin.vim
index d89824df0db2a0f8fb0c4ba97c0dbf9bed045ed6..9cd6e3229acdc4e2eab5369f85a6ad683e4ea079 100644 (file)
--- a/src/testdir/test_popupwin.vim
+++ b/src/testdir/test_popupwin.vim
@@ -926,6 +926,7 @@ func Test_win_execute_not_allowed()
   call assert_fails('call win_execute(winid, "tabnext")', 'E994:')
   call assert_fails('call win_execute(winid, "next")', 'E994:')
   call assert_fails('call win_execute(winid, "rewind")', 'E994:')
+  call assert_fails('call win_execute(winid, "pedit filename")', 'E994:')
   call assert_fails('call win_execute(winid, "buf")', 'E994:')
   call assert_fails('call win_execute(winid, "bnext")', 'E994:')
   call assert_fails('call win_execute(winid, "bprev")', 'E994:')

diff --git a/src/version.c b/src/version.c
index 18e0c1433da50cd20b4d6bfed85a314896746724..0c0cebed269453c1bd1aa06d8c11073e6332a0d0 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -738,6 +738,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    367,
 /**/
     366,
 /**/