summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-03-11 19:31:47 +0100
committerBram Moolenaar <Bram@vim.org>2016-03-11 19:31:47 +0100
commit9e496854a9fe56699687a4f86003fad115b3b375 (patch)
tree2b1fec9d58145f91e2529f31293b4ea49d5a18a5
parent846cdb227526272e2cd8ecba4f7168e2226cd633 (diff)
patch 7.4.1535v7.4.1535
Problem: The feedkeys test has a one second delay. Solution: Avoid need_wait_return() to delay. (Hirohito Higashi)
-rw-r--r--src/eval.c7
-rw-r--r--src/version.c2
2 files changed, 9 insertions, 0 deletions
diff --git a/src/eval.c b/src/eval.c
index edb2b258d8..9f56126f6b 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -11869,7 +11869,14 @@ f_feedkeys(typval_T *argvars, typval_T *rettv UNUSED)
if (vgetc_busy)
typebuf_was_filled = TRUE;
if (execute)
+ {
+ int save_msg_scroll = msg_scroll;
+
+ /* Avoid a 1 second delay when the keys start Insert mode. */
+ msg_scroll = FALSE;
exec_normal(TRUE);
+ msg_scroll |= save_msg_scroll;
+ }
}
}
}
diff --git a/src/version.c b/src/version.c
index e7bc3d89bf..d138eb844e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -744,6 +744,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1535,
+/**/
1534,
/**/
1533,