diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-01-21 23:32:32 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-01-21 23:32:32 +0100 |
| commit | 25281634cda03ce302aaf9f906a9520b5f81f91e (patch) | |
| tree | ccc62740f7af898d7be19893f8972baf3aa3013f /src/ex_docmd.c | |
| parent | d6357e8f93c50f984ffd69c3a0d247d8603f86c3 (diff) | |
patch 7.4.1150v7.4.1150
Problem: 'langmap' applies to the first character typed in Select mode.
(David Watson)
Solution: Check for SELECTMODE. (Christian Brabandt, closes #572)
Add the 'x' flag to feedkeys().
Diffstat (limited to 'src/ex_docmd.c')
| -rw-r--r-- | src/ex_docmd.c | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/src/ex_docmd.c b/src/ex_docmd.c index 837d135218..5c61679d7b 100644 --- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -10226,17 +10226,26 @@ exec_normal_cmd(cmd, remap, silent) int remap; int silent; { + /* Stuff the argument into the typeahead buffer. */ + ins_typebuf(cmd, remap, 0, TRUE, silent); + exec_normal(FALSE); +} +#endif + +#if defined(FEAT_EX_EXTRA) || defined(FEAT_MENU) || defined(FEAT_EVAL) \ + || defined(PROTO) +/* + * Execute normal_cmd() until there is no typeahead left. + */ + void +exec_normal(int was_typed) +{ oparg_T oa; - /* - * Stuff the argument into the typeahead buffer. - * Execute normal_cmd() until there is no typeahead left. - */ clear_oparg(&oa); finish_op = FALSE; - ins_typebuf(cmd, remap, 0, TRUE, silent); - while ((!stuff_empty() || (!typebuf_typed() && typebuf.tb_len > 0)) - && !got_int) + while ((!stuff_empty() || ((was_typed || !typebuf_typed()) + && typebuf.tb_len > 0)) && !got_int) { update_topline_cursor(); normal_cmd(&oa, TRUE); /* execute a Normal mode cmd */ |