diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2020-09-12 23:52:11 -0400 |
|---|---|---|
| committer | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2020-09-13 08:25:20 -0400 |
| commit | cc049a5612a08b810f5897f7b108e0cdaba445b7 (patch) | |
| tree | 8aa233e9d006c56544be58209e5581ebcb84b5fe /src | |
| parent | 4327fe8da54ad090e3ca08473ff198ad7cc1f448 (diff) | |
| download | rneovim-cc049a5612a08b810f5897f7b108e0cdaba445b7.tar.gz rneovim-cc049a5612a08b810f5897f7b108e0cdaba445b7.tar.bz2 rneovim-cc049a5612a08b810f5897f7b108e0cdaba445b7.zip | |
vim-patch:8.1.0640: get E14 while typing command :tab with 'incsearch' set
Problem: Get E14 while typing command :tab with 'incsearch' set.
Solution: Do not give an error when looking for the command. (Yasuhiro
Higashi)
https://github.com/vim/vim/commit/548e5985734e4b216852205879daf9bfb00dbe5a
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/ex_docmd.c | 20 | ||||
| -rw-r--r-- | src/nvim/testdir/test_search.vim | 15 |
2 files changed, 26 insertions, 9 deletions
diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c index dfebd13868..60b017be28 100644 --- a/src/nvim/ex_docmd.c +++ b/src/nvim/ex_docmd.c @@ -2228,17 +2228,19 @@ int parse_command_modifiers(exarg_T *eap, char_u **errormsg, bool skip_only) continue; case 't': if (checkforcmd(&p, "tab", 3)) { - long tabnr = get_address( - eap, &eap->cmd, ADDR_TABS, eap->skip, skip_only, false, 1); + if (!skip_only) { + long tabnr = get_address( + eap, &eap->cmd, ADDR_TABS, eap->skip, skip_only, false, 1); - if (tabnr == MAXLNUM) { - cmdmod.tab = tabpage_index(curtab) + 1; - } else { - if (tabnr < 0 || tabnr > LAST_TAB_NR) { - *errormsg = (char_u *)_(e_invrange); - return false; + if (tabnr == MAXLNUM) { + cmdmod.tab = tabpage_index(curtab) + 1; + } else { + if (tabnr < 0 || tabnr > LAST_TAB_NR) { + *errormsg = (char_u *)_(e_invrange); + return false; + } + cmdmod.tab = tabnr + 1; } - cmdmod.tab = tabnr + 1; } eap->cmd = p; continue; diff --git a/src/nvim/testdir/test_search.vim b/src/nvim/testdir/test_search.vim index fe502f140d..a945304e78 100644 --- a/src/nvim/testdir/test_search.vim +++ b/src/nvim/testdir/test_search.vim @@ -861,6 +861,21 @@ func Test_incsearch_with_change() call delete('Xis_change_script') endfunc +func Test_incsearch_cmdline_modifier() + throw 'skipped: Nvim does not support test_override()' + if !exists('+incsearch') + return + endif + call test_override("char_avail", 1) + new + call setline(1, ['foo']) + set incsearch + " Test that error E14 does not occur in parsing command modifier. + call feedkeys("V:tab", 'tx') + + call Incsearch_cleanup() +endfunc + func Test_incsearch_scrolling() if !CanRunVimInTerminal() return |