summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2015-01-27 15:19:24 +0100
committerBram Moolenaar <Bram@vim.org>2015-01-27 15:19:24 +0100
commit0a988df731605d692892f18317c26e6ab24d3d82 (patch)
tree324133ba7bd052b77f872a813eef737c2f80c235 /src
parent0cd040b96a14363de6928b4bc0a10d628ab40a52 (diff)
downloadvim-0a988df731605d692892f18317c26e6ab24d3d82.zip
updated for version 7.4.601
Problem: It is not possible to have feedkeys() insert characters. Solution: Add the 'i' flag.
Diffstat (limited to 'src')
-rw-r--r--src/eval.c4
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/eval.c b/src/eval.c
index 242a1f81e..c9c179a05 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -10500,6 +10500,7 @@ f_feedkeys(argvars, rettv)
typval_T *rettv UNUSED;
{
int remap = TRUE;
+ int insert = FALSE;
char_u *keys, *flags;
char_u nbuf[NUMBUFLEN];
int typed = FALSE;
@@ -10524,6 +10525,7 @@ f_feedkeys(argvars, rettv)
case 'n': remap = FALSE; break;
case 'm': remap = TRUE; break;
case 't': typed = TRUE; break;
+ case 'i': insert = TRUE; break;
}
}
}
@@ -10534,7 +10536,7 @@ f_feedkeys(argvars, rettv)
if (keys_esc != NULL)
{
ins_typebuf(keys_esc, (remap ? REMAP_YES : REMAP_NONE),
- typebuf.tb_len, !typed, FALSE);
+ insert ? 0 : typebuf.tb_len, !typed, FALSE);
vim_free(keys_esc);
if (vgetc_busy)
typebuf_was_filled = TRUE;
diff --git a/src/version.c b/src/version.c
index 6b98aca69..20291a789 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 601,
+/**/
600,
/**/
599,