Mercurial > vim
changeset 13866:4b35f2835ce4 v8.0.1804
patch 8.0.1804: using :normal in terminal window causes problems
commit https://github.com/vim/vim/commit/655a82a8d32c2cd248a46c0ce365a4d50e3d56bd
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue May 8 22:01:07 2018 +0200
patch 8.0.1804: using :normal in terminal window causes problems
Problem: Using :normal in terminal window causes problems. (Dominique
Pelle)
Solution: Don't call terminal_loop() for :normal. (closes #2886)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Tue, 08 May 2018 22:15:05 +0200 |
| parents | 3e1b1d88928e |
| children | 4e1289c328a1 |
| files | src/evalfunc.c src/ex_docmd.c src/proto/ex_docmd.pro src/version.c |
| diffstat | 4 files changed, 7 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/evalfunc.c +++ b/src/evalfunc.c @@ -3313,7 +3313,7 @@ f_feedkeys(typval_T *argvars, typval_T * if (!dangerous) ++ex_normal_busy; - exec_normal(TRUE); + exec_normal(TRUE, TRUE); if (!dangerous) --ex_normal_busy;
--- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -10323,14 +10323,14 @@ exec_normal_cmd(char_u *cmd, int remap, { /* Stuff the argument into the typeahead buffer. */ ins_typebuf(cmd, remap, 0, TRUE, silent); - exec_normal(FALSE); + exec_normal(FALSE, FALSE); } /* * Execute normal_cmd() until there is no typeahead left. */ void -exec_normal(int was_typed) +exec_normal(int was_typed, int may_use_terminal_loop UNUSED) { oparg_T oa; @@ -10341,7 +10341,7 @@ exec_normal(int was_typed) { update_topline_cursor(); #ifdef FEAT_TERMINAL - if (term_use_loop() + if (may_use_terminal_loop && term_use_loop() && oa.op_type == OP_NOP && oa.regname == NUL && !VIsual_active) {
--- a/src/proto/ex_docmd.pro +++ b/src/proto/ex_docmd.pro @@ -56,7 +56,7 @@ int save_current_state(save_state_T *sst void restore_current_state(save_state_T *sst); void ex_normal(exarg_T *eap); void exec_normal_cmd(char_u *cmd, int remap, int silent); -void exec_normal(int was_typed); +void exec_normal(int was_typed, int may_use_terminal_loop); int find_cmdline_var(char_u *src, int *usedlen); char_u *eval_vars(char_u *src, char_u *srcstart, int *usedlen, linenr_T *lnump, char_u **errormsg, int *escaped); char_u *expand_sfile(char_u *arg);