summaryrefslogtreecommitdiff
path: root/src/evalfunc.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2018-05-01 18:47:59 +0200
committerBram Moolenaar <Bram@vim.org>2018-05-01 18:47:59 +0200
commitb2ac14c0b5e23f8ab97c5c784bcd83e13ba8ded3 (patch)
treeccd71c85b849644e14fdbb4f85d2658542443dee /src/evalfunc.c
parent8a938af6ddefab4b4bc751d3f3545e1d95622c8a (diff)
downloadvim-git-b2ac14c0b5e23f8ab97c5c784bcd83e13ba8ded3.tar.gz
patch 8.0.1786: no test for 'termwinkey'v8.0.1786
Problem: No test for 'termwinkey'. Solution: Add a test. Make feedkeys() handle terminal_loop() returning before characters are consumed.
Diffstat (limited to 'src/evalfunc.c')
-rw-r--r--src/evalfunc.c18
1 files changed, 6 insertions, 12 deletions
diff --git a/src/evalfunc.c b/src/evalfunc.c
index ae1425e53..259edb8b1 100644
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -3311,18 +3311,12 @@ f_feedkeys(typval_T *argvars, typval_T *rettv UNUSED)
/* Avoid a 1 second delay when the keys start Insert mode. */
msg_scroll = FALSE;
-#ifdef FEAT_TERMINAL
- if (term_use_loop())
- terminal_loop(FALSE);
- else
-#endif
- {
- if (!dangerous)
- ++ex_normal_busy;
- exec_normal(TRUE);
- if (!dangerous)
- --ex_normal_busy;
- }
+ if (!dangerous)
+ ++ex_normal_busy;
+ exec_normal(TRUE);
+ if (!dangerous)
+ --ex_normal_busy;
+
msg_scroll |= save_msg_scroll;
}
}