aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/eval/funcs.c
diff options
context:
space:
mode:
authorzeertzjq <zeertzjq@outlook.com>2022-08-20 07:49:31 +0800
committerGitHub <noreply@github.com>2022-08-20 07:49:31 +0800
commit1a57cd383684b7488e02e094f49dfe607bc53632 (patch)
tree5c52e5eeb62d73a7a9ec549bb70a5599024ccf76 /src/nvim/eval/funcs.c
parentf342194396df126093f4575cea3a8546a6ba30a5 (diff)
parent15ca01b649fb35186f1eb9b4422c36f9d8d2c8b4 (diff)
downloadrneovim-1a57cd383684b7488e02e094f49dfe607bc53632.tar.gz
rneovim-1a57cd383684b7488e02e094f49dfe607bc53632.tar.bz2
rneovim-1a57cd383684b7488e02e094f49dfe607bc53632.zip
Merge pull request #19852 from zeertzjq/vim-8.2.3623
vim-patch:8.2.{3623,4667}: expandcmd() fixes
Diffstat (limited to 'src/nvim/eval/funcs.c')
-rw-r--r--src/nvim/eval/funcs.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/nvim/eval/funcs.c b/src/nvim/eval/funcs.c
index 456fd9fdf6..1798d43c6c 100644
--- a/src/nvim/eval/funcs.c
+++ b/src/nvim/eval/funcs.c
@@ -2052,10 +2052,10 @@ static void f_expandcmd(typval_T *argvars, typval_T *rettv, FunPtr fptr)
};
eap.argt |= EX_NOSPC;
+ emsg_off++;
expand_filename(&eap, &cmdstr, &errormsg);
- if (errormsg != NULL && *errormsg != NUL) {
- emsg(errormsg);
- }
+ emsg_off--;
+
rettv->vval.v_string = cmdstr;
}