diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-03-09 16:40:41 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-03-09 16:40:41 +0100 |
| commit | 3a2505cc183b3c5f4852ae8a945172582fbc650f (patch) | |
| tree | 4094257772a8e52c73df8d8213cb46206edd5d0a | |
| parent | 2e09634a7880f55a61cb6b959dd89c51972866af (diff) | |
| download | vim-git-8.2.0367.tar.gz | |
patch 8.2.0367: can use :pedit in a popup windowv8.2.0367
Problem: Can use :pedit in a popup window.
Solution: Disallow it.
| -rw-r--r-- | src/ex_docmd.c | 3 | ||||
| -rw-r--r-- | src/testdir/test_popupwin.vim | 1 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/src/ex_docmd.c b/src/ex_docmd.c index f2fb64698..58ea7c863 100644 --- 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 d89824df0..9cd6e3229 100644 --- 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 18e0c1433..0c0cebed2 100644 --- a/src/version.c +++ b/src/version.c @@ -739,6 +739,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 367, +/**/ 366, /**/ 365, |