From: Bram Moolenaar <Bram@vim.org>
Date: Fri, 11 Mar 2016 18:31:47 +0000 (+0100)
Subject: patch 7.4.1535
X-Git-Tag: v7.4.1535
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9e496854a9fe56699687a4f86003fad115b3b375;p=vim

patch 7.4.1535
Problem:    The feedkeys test has a one second delay.
Solution:   Avoid need_wait_return() to delay. (Hirohito Higashi)
---

diff --git a/src/eval.c b/src/eval.c
index edb2b258d..9f56126f6 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 e7bc3d89b..d138eb844 100644
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1535,
 /**/
     1534,
 /**/