Mercurial > vim

diff src/evalvars.c @ 21548:4e679db1c404 v8.2.1324

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.1324: Vim9: line break after "=" does not work Commit: https://github.com/vim/vim/commit/c7e44a7e4caedc1bc33f5c8e481109c0ae002823 Author: Bram Moolenaar <Bram@vim.org> Date: Wed Jul 29 21:37:43 2020 +0200 patch 8.2.1324: Vim9: line break after "=" does not work Problem: Vim9: line break after "=" does not work. Solution: Also allow for NUL after "=". (closes https://github.com/vim/vim/issues/6549)
author Bram Moolenaar <Bram@vim.org>
date Wed, 29 Jul 2020 21:45:04 +0200
parents 574517d682cf
children 586241ee8096
line wrap: on
line diff
--- a/src/evalvars.c
+++ b/src/evalvars.c
@@ -801,13 +801,13 @@ ex_let(exarg_T *eap)
 	    else
 		++expr;
 
-	    if (vim9script && (!VIM_ISWHITE(*argend) || !VIM_ISWHITE(*expr)))
+	    if (vim9script && (!VIM_ISWHITE(*argend)
+						   || !IS_WHITE_OR_NUL(*expr)))
 	    {
 		vim_strncpy(op, expr - len, len);
 		semsg(_(e_white_both), op);
 		i = FAIL;
 	    }
-	    expr = skipwhite(expr);
 
 	    if (eap->skip)
 		++emsg_skip;
@@ -818,6 +818,7 @@ ex_let(exarg_T *eap)
 		evalarg.eval_getline = eap->getline;
 		evalarg.eval_cookie = eap->cookie;
 	    }
+	    expr = skipwhite_and_linebreak(expr, &evalarg);
 	    i = eval0(expr, &rettv, eap, &evalarg);
 	    if (eap->skip)
 		--emsg_skip;