aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/nvim/api/vim.c5
-rw-r--r--src/nvim/version.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/src/nvim/api/vim.c b/src/nvim/api/vim.c
index b1572037cb..70e0c55528 100644
--- a/src/nvim/api/vim.c
+++ b/src/nvim/api/vim.c
@@ -92,7 +92,12 @@ void nvim_feedkeys(String keys, String mode, Boolean escape_csi)
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/nvim/version.c b/src/nvim/version.c
index 37e3369a1a..3f53391d74 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -743,7 +743,7 @@ static int included_patches[] = {
// 1538 NA
// 1537 NA
// 1536 NA
- // 1535,
+ 1535,
// 1534 NA
1533,
// 1532 NA