aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzeertzjq <zeertzjq@outlook.com>2023-04-14 12:48:08 +0800
committerzeertzjq <zeertzjq@outlook.com>2023-04-14 16:10:08 +0800
commit9ecfb42ec0b8959c291c5c1d28710fe12d3d070f (patch)
tree6219539b6aecdc6953fb025fd3a9585b04adc6df
parent37bb40701d672d5213ec1be4e21d7808aee968e7 (diff)
downloadrneovim-9ecfb42ec0b8959c291c5c1d28710fe12d3d070f.tar.gz
rneovim-9ecfb42ec0b8959c291c5c1d28710fe12d3d070f.tar.bz2
rneovim-9ecfb42ec0b8959c291c5c1d28710fe12d3d070f.zip
vim-patch:8.2.1062: Vim9: no line break allowed inside "cond ? val1 : val2"
Problem: Vim9: no line break allowed inside "cond ? val1 : val2". Solution: Check for operator after line break. https://github.com/vim/vim/commit/793648fb563359396a23740c72a6e04cb64df3a9 Co-authored-by: Bram Moolenaar <Bram@vim.org>
-rw-r--r--src/nvim/eval.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index a9c5ca46f3..29c294c754 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -2303,7 +2303,8 @@ int eval1(char **arg, typval_T *rettv, evalarg_T *const evalarg)
return FAIL;
}
- if ((*arg)[0] == '?') {
+ char *p = *arg;
+ if (*p == '?') {
evalarg_T nested_evalarg = evalarg == NULL ? (evalarg_T){ 0 } : *evalarg;
const int orig_flags = evalarg == NULL ? 0 : evalarg->eval_flags;
const bool evaluate = nested_evalarg.eval_flags & EVAL_EVALUATE;
@@ -2329,7 +2330,8 @@ int eval1(char **arg, typval_T *rettv, evalarg_T *const evalarg)
}
// Check for the ":".
- if ((*arg)[0] != ':') {
+ p = *arg;
+ if (*p != ':') {
emsg(_("E109: Missing ':' after '?'"));
if (evaluate && result) {
tv_clear(rettv);