From 25281634cda03ce302aaf9f906a9520b5f81f91e Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Thu, 21 Jan 2016 23:32:32 +0100 Subject: patch 7.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(). --- runtime/doc/eval.txt | 5 +++++ src/ex_docmd.c | 23 ++++++++++++++++------- src/getchar.c | 3 ++- src/normal.c | 2 +- src/proto/ex_docmd.pro | 1 + src/testdir/Make_all.mak | 1 + src/testdir/test_langmap.vim | 24 ++++++++++++++++++++++++ src/version.c | 2 ++ 8 files changed, 52 insertions(+), 9 deletions(-) create mode 100644 src/testdir/test_langmap.vim diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index 5e0be5899..ebd21ae66 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -3099,6 +3099,11 @@ feedkeys({string} [, {mode}]) *feedkeys()* if coming from a mapping. This matters for undo, opening folds, etc. 'i' Insert the string instead of appending (see above). + 'x' Execute commands until typeahead is empty. This is + similar to using ":normal!". You can call feedkeys() + several times without 'x' and then one time with 'x' + (possibly with an empty {string}) to execute all the + typeahead. Return value is always 0. filereadable({file}) *filereadable()* diff --git a/src/ex_docmd.c b/src/ex_docmd.c index 837d13521..5c61679d7 100644 --- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -10225,18 +10225,27 @@ exec_normal_cmd(cmd, remap, silent) char_u *cmd; 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 */ diff --git a/src/getchar.c b/src/getchar.c index 70829e18e..5b5eab387 100644 --- a/src/getchar.c +++ b/src/getchar.c @@ -2149,7 +2149,8 @@ vgetorpeek(advance) else { LANGMAP_ADJUST(c1, - (State & (CMDLINE | INSERT)) == 0); + (State & (CMDLINE | INSERT)) == 0 + && get_real_state() != SELECTMODE); nolmaplen = 0; } #endif diff --git a/src/normal.c b/src/normal.c index ac1a391f2..17cb8d6b8 100644 --- a/src/normal.c +++ b/src/normal.c @@ -638,7 +638,7 @@ normal_cmd(oap, toplevel) * Get the command character from the user. */ c = safe_vgetc(); - LANGMAP_ADJUST(c, TRUE); + LANGMAP_ADJUST(c, get_real_state() != SELECTMODE); /* * If a mapping was started in Visual or Select mode, remember the length diff --git a/src/proto/ex_docmd.pro b/src/proto/ex_docmd.pro index f4d434725..15e5fc5c0 100644 --- a/src/proto/ex_docmd.pro +++ b/src/proto/ex_docmd.pro @@ -50,6 +50,7 @@ int vim_mkdir_emsg(char_u *name, int prot); FILE *open_exfile(char_u *fname, int forceit, char *mode); void update_topline_cursor(void); void exec_normal_cmd(char_u *cmd, int remap, int silent); +void exec_normal(int was_typed); int find_cmdline_var(char_u *src, int *usedlen); char_u *eval_vars(char_u *src, char_u *srcstart, int *usedlen, linenr_T *lnump, char_u **errormsg, int *escaped); char_u *expand_sfile(char_u *arg); diff --git a/src/testdir/Make_all.mak b/src/testdir/Make_all.mak index d02e8d2b4..d7a06eeb4 100644 --- a/src/testdir/Make_all.mak +++ b/src/testdir/Make_all.mak @@ -173,6 +173,7 @@ NEW_TESTS = test_arglist.res \ test_cdo.res \ test_hardcopy.res \ test_increment.res \ + test_langmap.res \ test_perl.res \ test_quickfix.res \ test_syntax.res \ diff --git a/src/testdir/test_langmap.vim b/src/testdir/test_langmap.vim new file mode 100644 index 000000000..066c3bf2b --- /dev/null +++ b/src/testdir/test_langmap.vim @@ -0,0 +1,24 @@ +" tests for 'langmap' + +func Test_langmap() + new + set langmap=}l,^x,%v + + call setline(1, ['abc']) + call feedkeys('gg0}^', 'tx') + call assert_equal('ac', getline(1)) + + " in Replace mode + " need silent! to avoid a delay when entering Insert mode + call setline(1, ['abcde']) + silent! call feedkeys("gg0lR%{z\00", 'tx') + call assert_equal('a%{ze', getline(1)) + + " in Select mode + " need silent! to avoid a delay when entering Insert mode + call setline(1, ['abcde']) + silent! call feedkeys("gg0}%}\}^\00", 'tx') + call assert_equal('a}^de', getline(1)) + + quit! +endfunc diff --git a/src/version.c b/src/version.c index 96e0105fb..6aee23d43 100644 --- a/src/version.c +++ b/src/version.c @@ -741,6 +741,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1150, /**/ 1149, /**/ -- cgit v1.2.1