From 15ca01b649fb35186f1eb9b4422c36f9d8d2c8b4 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sat, 20 Aug 2022 06:51:06 +0800
Subject: vim-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 vim/vim#10063)
https://github.com/vim/vim/commit/5018a836c030988944a9bbe2fd2e538bf5261a72
---
 src/nvim/eval/funcs.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/nvim/eval/funcs.c')

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;
 }
 
-- 
cgit