diff options
| author | Yegappan Lakshmanan <yegappan@yahoo.com> | 2022-04-02 21:12:21 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-04-02 21:12:21 +0100 |
| commit | 5018a836c030988944a9bbe2fd2e538bf5261a72 (patch) | |
| tree | 06f7751f967cb1abca449a8ff12df6444a80471d /src/evalfunc.c | |
| parent | 97f8c1081ec6d6d158bb51e18fa23a36d3ed5623 (diff) | |
patch 8.2.4667: expandcmd() fails on an errorv8.2.4667
Problem: expandcmd() fails on an error.
Solution: On failure return the command unmodified. (yegappan Lakshmanan,
closes #10063)
Diffstat (limited to 'src/evalfunc.c')
| -rw-r--r-- | src/evalfunc.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/evalfunc.c b/src/evalfunc.c index 39a2fd2766..60ca50a111 100644 --- a/src/evalfunc.c +++ b/src/evalfunc.c @@ -4168,9 +4168,9 @@ f_expandcmd(typval_T *argvars, typval_T *rettv) 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 @@ common_function(typval_T *argvars, typval_T *rettv, int is_funcref) 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; } |