# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1457721904 -3600
# Node ID 76b9c2305531a448e6f34abdc4b4a13687b48137
# Parent  8970a0216d061054c3b51135f3eca3d4b18e33bf
commit https://github.com/vim/vim/commit/9e496854a9fe56699687a4f86003fad115b3b375
Author: Bram Moolenaar <Bram@vim.org>
Date:   Fri Mar 11 19:31:47 2016 +0100

    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
--- a/src/eval.c
+++ b/src/eval.c
@@ -11869,7 +11869,14 @@ f_feedkeys(typval_T *argvars, typval_T *
 	    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
--- 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,