diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-01-18 15:06:19 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-01-18 15:06:19 +0100 |
| commit | 3029bcc094415243bad14e5720f68e857b755dad (patch) | |
| tree | 79e829df7781f4e7c43f2fac6baf9c5344af1302 | |
| parent | 94b6fb78c578caab014fea4029bb534246a95f6f (diff) | |
patch 8.2.0127: some buffer commands work in a popup windowv8.2.0127
Problem: Some buffer commands work in a popup window.
Solution: Disallow :bnext, :bprev, etc. (Naruhiko Nishino, closes #5494)
| -rw-r--r-- | src/ex_docmd.c | 12 | ||||
| -rw-r--r-- | src/testdir/test_popupwin.vim | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 18 insertions, 0 deletions
diff --git a/src/ex_docmd.c b/src/ex_docmd.c index 78aee97992..51d85c3a2a 100644 --- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -4613,6 +4613,9 @@ ex_bmodified(exarg_T *eap) static void ex_bnext(exarg_T *eap) { + if (ERROR_IF_POPUP_WINDOW) + return; + goto_buffer(eap, DOBUF_CURRENT, FORWARD, (int)eap->line2); if (eap->do_ecmd_cmd != NULL) do_cmdline_cmd(eap->do_ecmd_cmd); @@ -4627,6 +4630,9 @@ ex_bnext(exarg_T *eap) static void ex_bprevious(exarg_T *eap) { + if (ERROR_IF_POPUP_WINDOW) + return; + goto_buffer(eap, DOBUF_CURRENT, BACKWARD, (int)eap->line2); if (eap->do_ecmd_cmd != NULL) do_cmdline_cmd(eap->do_ecmd_cmd); @@ -4641,6 +4647,9 @@ ex_bprevious(exarg_T *eap) static void ex_brewind(exarg_T *eap) { + if (ERROR_IF_POPUP_WINDOW) + return; + goto_buffer(eap, DOBUF_FIRST, FORWARD, 0); if (eap->do_ecmd_cmd != NULL) do_cmdline_cmd(eap->do_ecmd_cmd); @@ -4653,6 +4662,9 @@ ex_brewind(exarg_T *eap) static void ex_blast(exarg_T *eap) { + if (ERROR_IF_POPUP_WINDOW) + return; + goto_buffer(eap, DOBUF_LAST, BACKWARD, 0); if (eap->do_ecmd_cmd != NULL) do_cmdline_cmd(eap->do_ecmd_cmd); diff --git a/src/testdir/test_popupwin.vim b/src/testdir/test_popupwin.vim index 9370a11a79..654501b29b 100644 --- a/src/testdir/test_popupwin.vim +++ b/src/testdir/test_popupwin.vim @@ -913,6 +913,10 @@ func Test_win_execute_not_allowed() 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, "buf")', 'E994:') + call assert_fails('call win_execute(winid, "bnext")', 'E994:') + call assert_fails('call win_execute(winid, "bprev")', 'E994:') + call assert_fails('call win_execute(winid, "bfirst")', 'E994:') + call assert_fails('call win_execute(winid, "blast")', 'E994:') call assert_fails('call win_execute(winid, "edit")', 'E994:') call assert_fails('call win_execute(winid, "enew")', 'E994:') call assert_fails('call win_execute(winid, "wincmd x")', 'E994:') diff --git a/src/version.c b/src/version.c index 71aecc8a74..d6fa59c9e7 100644 --- a/src/version.c +++ b/src/version.c @@ -743,6 +743,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 127, +/**/ 126, /**/ 125, |