Mercurial > vim
diff src/ex_docmd.c @ 19271:ebeeb4b4a1fa v8.2.0194
patch 8.2.0194: some commands can cause problems in terminal popup
Commit: https://github.com/vim/vim/commit/3c01c4a02897163996639f6f2604c68eab2bd18b
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Feb 1 23:04:24 2020 +0100
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.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sat, 01 Feb 2020 23:15:03 +0100 |
| parents | a20c66f13a6e |
| children | b6da81589f8c |
line wrap: on
line diff
--- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -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.