aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-27 04:14:06 -04:00
Code Activity

patch 8.2.0127: some buffer commands work in a popup window

Browse Source 
Problem:    Some buffer commands work in a popup window.
Solution:   Disallow :bnext, :bprev, etc. (Naruhiko Nishino, closes #5494)
This commit is contained in:
Bram Moolenaar
2020-01-18 15:06:19 +01:00
parent 94b6fb78c5
commit 3029bcc094
3 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/ex_docmd.c
View File

@@ -4613,6 +4613,9 @@ ex_bmodified(exarg_T *eap)
static void static void
ex_bnext(exarg_T *eap) ex_bnext(exarg_T *eap)
{ {
if (ERROR_IF_POPUP_WINDOW)
return;
goto_buffer(eap, DOBUF_CURRENT, FORWARD, (int)eap->line2); goto_buffer(eap, DOBUF_CURRENT, FORWARD, (int)eap->line2);
if (eap->do_ecmd_cmd != NULL) if (eap->do_ecmd_cmd != NULL)
do_cmdline_cmd(eap->do_ecmd_cmd); do_cmdline_cmd(eap->do_ecmd_cmd);
@@ -4627,6 +4630,9 @@ ex_bnext(exarg_T *eap)
static void static void
ex_bprevious(exarg_T *eap) ex_bprevious(exarg_T *eap)
{ {
if (ERROR_IF_POPUP_WINDOW)
return;
goto_buffer(eap, DOBUF_CURRENT, BACKWARD, (int)eap->line2); goto_buffer(eap, DOBUF_CURRENT, BACKWARD, (int)eap->line2);
if (eap->do_ecmd_cmd != NULL) if (eap->do_ecmd_cmd != NULL)
do_cmdline_cmd(eap->do_ecmd_cmd); do_cmdline_cmd(eap->do_ecmd_cmd);
@@ -4641,6 +4647,9 @@ ex_bprevious(exarg_T *eap)
static void static void
ex_brewind(exarg_T *eap) ex_brewind(exarg_T *eap)
{ {
if (ERROR_IF_POPUP_WINDOW)
return;
goto_buffer(eap, DOBUF_FIRST, FORWARD, 0); goto_buffer(eap, DOBUF_FIRST, FORWARD, 0);
if (eap->do_ecmd_cmd != NULL) if (eap->do_ecmd_cmd != NULL)
do_cmdline_cmd(eap->do_ecmd_cmd); do_cmdline_cmd(eap->do_ecmd_cmd);
@@ -4653,6 +4662,9 @@ ex_brewind(exarg_T *eap)
static void static void
ex_blast(exarg_T *eap) ex_blast(exarg_T *eap)
{ {
if (ERROR_IF_POPUP_WINDOW)
return;
goto_buffer(eap, DOBUF_LAST, BACKWARD, 0); goto_buffer(eap, DOBUF_LAST, BACKWARD, 0);
if (eap->do_ecmd_cmd != NULL) if (eap->do_ecmd_cmd != NULL)
do_cmdline_cmd(eap->do_ecmd_cmd); do_cmdline_cmd(eap->do_ecmd_cmd);

4
src/testdir/test_popupwin.vim
View File

@@ -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, "next")', 'E994:')
call assert_fails('call win_execute(winid, "rewind")', '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, "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, "edit")', 'E994:')
call assert_fails('call win_execute(winid, "enew")', 'E994:') call assert_fails('call win_execute(winid, "enew")', 'E994:')
call assert_fails('call win_execute(winid, "wincmd x")', 'E994:') call assert_fails('call win_execute(winid, "wincmd x")', 'E994:')

2
src/version.c
View File

@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
127,
/**/ /**/
126, 126,
/**/ /**/