mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-20 10:18:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: make nvim_cmd not suppress errors inside key mapping

Browse Source 
Closes #18632
This commit is contained in:
Famiu Haque
2022-05-19 21:49:12 +06:00
parent 95580f31b3
commit fb8fa004d8
3 changed files with 35 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/nvim/ex_docmd.c
View File

@@ -1583,13 +1583,14 @@ bool parse_cmdline(char *cmdline, exarg_T *eap, CmdParseInfo *cmdinfo, char **er
/// @param cmdinfo Command parse information
void execute_cmd(exarg_T *eap, CmdParseInfo *cmdinfo)
{
char *errormsg = NULL;
#define ERROR(msg) \
do { \
emsg(msg); \
errormsg = msg; \
goto end; \
} while (0)
char *errormsg = NULL;
cmdmod_T save_cmdmod = cmdmod;
cmdmod = cmdinfo->cmdmod;
@@ -1648,7 +1649,7 @@ void execute_cmd(exarg_T *eap, CmdParseInfo *cmdinfo)
// If filename expansion is enabled, expand filenames
if (cmdinfo->magic.file) {
if (expand_filename(eap, (char_u **)eap->cmdlinep, &errormsg) == FAIL) {
ERROR(errormsg);
goto end;
}
}
@@ -1706,14 +1707,20 @@ void execute_cmd(exarg_T *eap, CmdParseInfo *cmdinfo)
eap->errmsg = NULL;
(cmdnames[eap->cmdidx].cmd_func)(eap);
if (eap->errmsg != NULL) {
ERROR(_(eap->errmsg));
errormsg = _(eap->errmsg);
}
}
end:
if (errormsg != NULL && *errormsg != NUL) {
emsg(errormsg);
}
// Undo command modifiers
undo_cmdmod(eap, msg_scroll);
cmdmod = save_cmdmod;
if (eap->did_sandbox) {
sandbox--;
}
#undef ERROR
}