patch 8.2.4667: expandcmd() fails on an error
Problem: expandcmd() fails on an error.
Solution: On failure return the command unmodified. (yegappan Lakshmanan,
closes #10063)
diff --git a/src/evalfunc.c b/src/evalfunc.c
index 39a2fd2..60ca50a 100644
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -4168,9 +4168,9 @@
eap.nextcmd = NULL;
eap.cmdidx = CMD_USER;
+ ++emsg_off;
expand_filename(&eap, &cmdstr, &errormsg);
- if (errormsg != NULL && *errormsg != NUL)
- emsg(errormsg);
+ --emsg_off;
rettv->vval.v_string = cmdstr;
}
@@ -4444,8 +4444,7 @@
arg_idx = 0;
else if (list->lv_len > MAX_FUNC_ARGS)
{
- emsg_funcname((char *)e_too_many_arguments_for_function_str,
- s);
+ emsg_funcname(e_too_many_arguments_for_function_str, s);
vim_free(name);
goto theend;
}
diff --git a/src/testdir/test_expand.vim b/src/testdir/test_expand.vim
index e68d55e..ce414e4 100644
--- a/src/testdir/test_expand.vim
+++ b/src/testdir/test_expand.vim
@@ -78,10 +78,11 @@
edit a1a2a3.rb
call assert_equal('make b1b2b3.rb a1a2a3 Xfile.o', expandcmd('make %:gs?a?b? %< #<.o'))
- call assert_fails('call expandcmd("make <afile>")', 'E495:')
- call assert_fails('call expandcmd("make <afile>")', 'E495:')
+ call assert_equal('make <afile>', expandcmd("make <afile>"))
+ call assert_equal('make <amatch>', expandcmd("make <amatch>"))
+ call assert_equal('make <abuf>', expandcmd("make <abuf>"))
enew
- call assert_fails('call expandcmd("make %")', 'E499:')
+ call assert_equal('make %', expandcmd("make %"))
let $FOO="blue\tsky"
call setline(1, "$FOO")
call assert_equal("grep pat blue\tsky", expandcmd('grep pat <cfile>'))
@@ -94,6 +95,11 @@
let $FOO= "foo bar baz"
call assert_equal("e foo bar baz", expandcmd("e $FOO"))
+ if has('unix')
+ " test for using the shell to expand a command argument
+ call assert_equal('{1..4}', expandcmd('{1..4}'))
+ endif
+
unlet $FOO
close!
endfunc
@@ -101,14 +107,14 @@
" Test for expanding <sfile>, <slnum> and <sflnum> outside of sourcing a script
func Test_source_sfile()
let lines =<< trim [SCRIPT]
- :call assert_fails('echo expandcmd("<sfile>")', 'E498:')
- :call assert_fails('echo expandcmd("<slnum>")', 'E842:')
- :call assert_fails('echo expandcmd("<sflnum>")', 'E961:')
- :call assert_fails('call expandcmd("edit <cfile>")', 'E446:')
- :call assert_fails('call expandcmd("edit #")', 'E194:')
- :call assert_fails('call expandcmd("edit #<2")', 'E684:')
- :call assert_fails('call expandcmd("edit <cword>")', 'E348:')
- :call assert_fails('call expandcmd("edit <cexpr>")', 'E348:')
+ :call assert_equal('<sfile>', expandcmd("<sfile>"))
+ :call assert_equal('<slnum>', expandcmd("<slnum>"))
+ :call assert_equal('<sflnum>', expandcmd("<sflnum>"))
+ :call assert_equal('edit <cfile>', expandcmd("edit <cfile>"))
+ :call assert_equal('edit #', expandcmd("edit #"))
+ :call assert_equal('edit #<2', expandcmd("edit #<2"))
+ :call assert_equal('edit <cword>', expandcmd("edit <cword>"))
+ :call assert_equal('edit <cexpr>', expandcmd("edit <cexpr>"))
:call assert_fails('autocmd User MyCmd echo "<sfile>"', 'E498:')
:call writefile(v:errors, 'Xresult')
:qall!
diff --git a/src/version.c b/src/version.c
index b6fd047..6742703 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 4667,
+/**/
4666,
/**/
4665,