0
0
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00

patch 8.2.0194: some commands can cause problems in terminal popup

Problem:    Some commands can cause problems in terminal popup.
Solution:   Disallow more commands.
This commit is contained in:
Bram Moolenaar
2020-02-01 23:04:24 +01:00
parent 284d1c24e2
commit 3c01c4a028
8 changed files with 26 additions and 21 deletions

View File

@@ -4633,7 +4633,7 @@ ex_doautocmd(exarg_T *eap)
static void
ex_bunload(exarg_T *eap)
{
if (ERROR_IF_POPUP_WINDOW)
if (ERROR_IF_ANY_POPUP_WINDOW)
return;
eap->errmsg = do_bufdel(
eap->cmdidx == CMD_bdelete ? DOBUF_DEL
@@ -4649,7 +4649,7 @@ ex_bunload(exarg_T *eap)
static void
ex_buffer(exarg_T *eap)
{
if (ERROR_IF_POPUP_WINDOW)
if (ERROR_IF_ANY_POPUP_WINDOW)
return;
if (*eap->arg)
eap->errmsg = e_trailing;
@@ -4683,7 +4683,7 @@ ex_bmodified(exarg_T *eap)
static void
ex_bnext(exarg_T *eap)
{
if (ERROR_IF_POPUP_WINDOW)
if (ERROR_IF_ANY_POPUP_WINDOW)
return;
goto_buffer(eap, DOBUF_CURRENT, FORWARD, (int)eap->line2);
@@ -4700,7 +4700,7 @@ ex_bnext(exarg_T *eap)
static void
ex_bprevious(exarg_T *eap)
{
if (ERROR_IF_POPUP_WINDOW)
if (ERROR_IF_ANY_POPUP_WINDOW)
return;
goto_buffer(eap, DOBUF_CURRENT, BACKWARD, (int)eap->line2);
@@ -4717,7 +4717,7 @@ ex_bprevious(exarg_T *eap)
static void
ex_brewind(exarg_T *eap)
{
if (ERROR_IF_POPUP_WINDOW)
if (ERROR_IF_ANY_POPUP_WINDOW)
return;
goto_buffer(eap, DOBUF_FIRST, FORWARD, 0);
@@ -4732,7 +4732,7 @@ ex_brewind(exarg_T *eap)
static void
ex_blast(exarg_T *eap)
{
if (ERROR_IF_POPUP_WINDOW)
if (ERROR_IF_ANY_POPUP_WINDOW)
return;
goto_buffer(eap, DOBUF_LAST, BACKWARD, 0);
@@ -5762,7 +5762,7 @@ ex_splitview(exarg_T *eap)
|| eap->cmdidx == CMD_tabfind
|| eap->cmdidx == CMD_tabnew;
if (ERROR_IF_POPUP_WINDOW)
if (ERROR_IF_ANY_POPUP_WINDOW)
return;
#ifdef FEAT_GUI
@@ -6145,7 +6145,8 @@ do_exedit(
int need_hide;
int exmode_was = exmode_active;
if (eap->cmdidx != CMD_pedit && ERROR_IF_POPUP_WINDOW)
if ((eap->cmdidx != CMD_pedit && ERROR_IF_POPUP_WINDOW)
|| ERROR_IF_TERM_POPUP_WINDOW)
return;
/*
* ":vi" command ends Ex mode.