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

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

https://github.com/vim/vim/commit/f2588b6fc90ba85b333ee8f747e8d1ebbc7e6300

1 files changed, 8 insertions, 5 deletions

diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index f638b90caa..42e53cfdfc 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -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;
   }