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

vim-patch:9.0.1508: catch does not work when lines are joined with a newline

Browse Source 
Problem:    Catch does not work when lines are joined with a newline.
Solution:   Set "nextcmd" appropriately. (closes vim/vim#12348)

f2588b6fc9
This commit is contained in:
zeertzjq
2023-05-06 07:44:34 +08:00
parent ad7f9a701c
commit 6b912dec8e
2 changed files with 38 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/nvim/eval.c
View File

@@ -2368,11 +2368,14 @@ int eval0(char *arg, typval_T *rettv, exarg_T *eap, evalarg_T *const evalarg)
}
}
// Some of the expression may not have been consumed. Do not check for
// a next command to avoid more errors, unless "|" is following, which
// could only be a command separator.
if (eap != NULL && skipwhite(p)[0] == '|' && skipwhite(p)[1] != '|') {
eap->nextcmd = check_nextcmd(p);
if (eap != NULL && p != NULL) {
// Some of the expression may not have been consumed.
// Only execute a next command if it cannot be a "||" operator.
// The next command may be "catch".
char *nextcmd = check_nextcmd(p);
if (nextcmd != NULL && *nextcmd != '|') {
eap->nextcmd = nextcmd;
}
}
return FAIL;
}