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.0.1804: using :normal in terminal window causes problems

Browse Source 
Problem:    Using :normal in terminal window causes problems. (Dominique
            Pelle)
Solution:   Don't call terminal_loop() for :normal. (closes #2886)
This commit is contained in:
Bram Moolenaar
2018-05-08 22:01:07 +02:00
parent 9b50f36e40
commit 655a82a8d3
4 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/evalfunc.c
View File

@@ -3313,7 +3313,7 @@ f_feedkeys(typval_T *argvars, typval_T *rettv UNUSED)
if (!dangerous) if (!dangerous)
++ex_normal_busy; ++ex_normal_busy;
exec_normal(TRUE); exec_normal(TRUE, TRUE);
if (!dangerous) if (!dangerous)
--ex_normal_busy; --ex_normal_busy;

6
src/ex_docmd.c
View File

@@ -10323,14 +10323,14 @@ exec_normal_cmd(char_u *cmd, int remap, int silent)
{ {
/* Stuff the argument into the typeahead buffer. */ /* Stuff the argument into the typeahead buffer. */
ins_typebuf(cmd, remap, 0, TRUE, silent); ins_typebuf(cmd, remap, 0, TRUE, silent);
exec_normal(FALSE); exec_normal(FALSE, FALSE);
} }
/* /*
* Execute normal_cmd() until there is no typeahead left. * Execute normal_cmd() until there is no typeahead left.
*/ */
void void
exec_normal(int was_typed) exec_normal(int was_typed, int may_use_terminal_loop UNUSED)
{ {
oparg_T oa; oparg_T oa;
@@ -10341,7 +10341,7 @@ exec_normal(int was_typed)
{ {
update_topline_cursor(); update_topline_cursor();
#ifdef FEAT_TERMINAL #ifdef FEAT_TERMINAL
if (term_use_loop() if (may_use_terminal_loop && term_use_loop()
&& oa.op_type == OP_NOP && oa.regname == NUL && oa.op_type == OP_NOP && oa.regname == NUL
&& !VIsual_active) && !VIsual_active)
{ {

2
src/proto/ex_docmd.pro
View File

@@ -56,7 +56,7 @@ int save_current_state(save_state_T *sst);
void restore_current_state(save_state_T *sst); void restore_current_state(save_state_T *sst);
void ex_normal(exarg_T *eap); void ex_normal(exarg_T *eap);
void exec_normal_cmd(char_u *cmd, int remap, int silent); 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); 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 *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); char_u *expand_sfile(char_u *arg);

2
src/version.c
View File

@@ -761,6 +761,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 */
/**/
1804,
/**/ /**/
1803, 1803,
/**/ /**/