aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/api/vim.c
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2020-01-06 06:52:52 -0800
committerGitHub <noreply@github.com>2020-01-06 06:52:52 -0800
commit83b0054b87f82583873a6e7ef291507c580618b1 (patch)
tree1e3e8c3ee47b084e774c65f16950350afbd7a1cf /src/nvim/api/vim.c
parentfa9b057d356edb9de7c778d62aed8d2451de56fb (diff)
parent83083dd47b0c2880e4e1401f1c751013c533d57f (diff)
downloadrneovim-83b0054b87f82583873a6e7ef291507c580618b1.tar.gz
rneovim-83b0054b87f82583873a6e7ef291507c580618b1.tar.bz2
rneovim-83b0054b87f82583873a6e7ef291507c580618b1.zip
Merge #11674 'vim-patch:8.0.1786,8.1.{851,1308,1309,1579}'
Diffstat (limited to 'src/nvim/api/vim.c')
-rw-r--r--src/nvim/api/vim.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/nvim/api/vim.c b/src/nvim/api/vim.c
index a649eab97c..d35d04cdb3 100644
--- a/src/nvim/api/vim.c
+++ b/src/nvim/api/vim.c
@@ -241,15 +241,15 @@ void nvim_feedkeys(String keys, String mode, Boolean escape_csi)
keys_esc = keys.data;
}
ins_typebuf((char_u *)keys_esc, (remap ? REMAP_YES : REMAP_NONE),
- insert ? 0 : typebuf.tb_len, !typed, false);
+ insert ? 0 : typebuf.tb_len, !typed, false);
+ if (vgetc_busy) {
+ typebuf_was_filled = true;
+ }
if (escape_csi) {
xfree(keys_esc);
}
- if (vgetc_busy) {
- typebuf_was_filled = true;
- }
if (execute) {
int save_msg_scroll = msg_scroll;