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 edb2b258d8234dec6216d48adf0a5fd42a91cc76..9f56126f6b9b8cc26810dc45557f62a34273089e 100644 (file)
--- 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 e7bc3d89bf6ba0ecd73a92942b7e9ba9d68602b6..d138eb844e042391e8afa10a898af621d3f05e54 100644 (file)
--- 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,
 /**/