diff options
author | Bram Moolenaar <Bram@vim.org> | 2016-01-21 23:34:58 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2016-01-21 23:34:58 +0100 |
commit | 5f8a14b9dea094b8bbab94cfc1e8da8e633fbc01 (patch) | |
tree | cbd8853889f3910af2fd1fbebd7b71c7a55f201e | |
parent | 25281634cda03ce302aaf9f906a9520b5f81f91e (diff) |
patch 7.4.1151v7.4.1151
Problem: Missing change to eval.c
Solution: Also change feedkeys().
-rw-r--r-- | src/eval.c | 4 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/eval.c b/src/eval.c index de30f712ee..565d71d786 100644 --- a/src/eval.c +++ b/src/eval.c @@ -10960,6 +10960,7 @@ f_feedkeys(argvars, rettv) char_u *keys, *flags; char_u nbuf[NUMBUFLEN]; int typed = FALSE; + int execute = FALSE; char_u *keys_esc; /* This is not allowed in the sandbox. If the commands would still be @@ -10982,6 +10983,7 @@ f_feedkeys(argvars, rettv) case 'm': remap = TRUE; break; case 't': typed = TRUE; break; case 'i': insert = TRUE; break; + case 'x': execute = TRUE; break; } } } @@ -10996,6 +10998,8 @@ f_feedkeys(argvars, rettv) vim_free(keys_esc); if (vgetc_busy) typebuf_was_filled = TRUE; + if (execute) + exec_normal(TRUE); } } } diff --git a/src/version.c b/src/version.c index 6aee23d435..83540a49cb 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 */ /**/ + 1151, +/**/ 1150, /**/ 1149, |