patch 8.2.0127: some buffer commands work in a popup window

Problem:    Some buffer commands work in a popup window.
Solution:   Disallow :bnext, :bprev, etc. (Naruhiko Nishino, closes #5494)

diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 78aee97992b1b50da920f9106d28498c7faf980c..51d85c3a2a0d344f4b58e242ec3afe2c7f73812b 100644 (file)
--- 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 9370a11a79f7bae752867768d6ed384e309f1a70..654501b29ba1e69ef5ba9a9205f0055c8f28a1c3 100644 (file)
--- 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 71aecc8a7473d7b17ada19637f2db7103755cb10..d6fa59c9e773d5b4ffdcc1f24ef8dad2e9ff4ce0 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    127,
 /**/
     126,
 /**/