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)
diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 67f505d..aad8182 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -2827,18 +2827,22 @@
case 't': if (checkforcmd(&p, "tab", 3))
{
- 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 (!skip_only)
{
- if (tabnr < 0 || tabnr > LAST_TAB_NR)
+ 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
{
- *errormsg = (char_u *)_(e_invrange);
- return FAIL;
+ if (tabnr < 0 || tabnr > LAST_TAB_NR)
+ {
+ *errormsg = (char_u *)_(e_invrange);
+ return FAIL;
+ }
+ cmdmod.tab = tabnr + 1;
}
- cmdmod.tab = tabnr + 1;
}
eap->cmd = p;
continue;
diff --git a/src/testdir/test_search.vim b/src/testdir/test_search.vim
index 3c83dd1..86df794 100644
--- a/src/testdir/test_search.vim
+++ b/src/testdir/test_search.vim
@@ -783,6 +783,20 @@
bwipe!
endfunc
+func Test_incsearch_cmdline_modifier()
+ 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
diff --git a/src/version.c b/src/version.c
index 30f2899..10ba489 100644
--- a/src/version.c
+++ b/src/version.c
@@ -800,6 +800,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 640,
+/**/
639,
/**/
638,