From: mityu <mityu.mail@gmail.com>
Date: Fri, 28 May 2021 11:50:17 +0000 (+0200)
Subject: patch 8.2.2892: error message contains random characters
X-Git-Tag: v8.2.2892
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=89dcb4dce369de22fba13b9c3c63f11f8d42650b;p=thirdparty%2Fvim.git

patch 8.2.2892: error message contains random characters

Problem:    Error message contains random characters.
Solution:   Pass the right pointer to error_white_both(). (closes #8272,
            closes #8263)
---

diff --git a/src/eval.c b/src/eval.c
index b5820b8d32..f75263d9e8 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -2934,7 +2934,7 @@ eval5(char_u **arg, typval_T *rettv, evalarg_T *evalarg)
 	 */
 	if (evaluate && vim9script && !IS_WHITE_OR_NUL((*arg)[oplen]))
 	{
-	    error_white_both(p, oplen);
+	    error_white_both(*arg, oplen);
 	    clear_tv(rettv);
 	    return FAIL;
 	}
diff --git a/src/testdir/test_vim9_expr.vim b/src/testdir/test_vim9_expr.vim
index 3ca1f342cc..f1762d7d0b 100644
--- a/src/testdir/test_vim9_expr.vim
+++ b/src/testdir/test_vim9_expr.vim
@@ -1220,7 +1220,14 @@ def Test_expr5_vim9script()
   lines =<< trim END
       echo 'a'.. 'b'
   END
-  CheckDefAndScriptFailure(lines, 'E1004:', 1)
+  CheckDefAndScriptFailure(lines, 'E1004: White space required before and after ''..'' at ".. ''b''"', 1)
+
+  lines =<< trim END
+      echo 'a'
+          ..'b'
+      # comment
+  END
+  CheckDefAndScriptFailure(lines, 'E1004: White space required before and after ''..'' at "..''b''"', 2)
 
   # check invalid string concatenation
   lines =<< trim END
diff --git a/src/version.c b/src/version.c
index 775c4f496a..fb8a7ad92a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2892,
 /**/
     2891,
 /**/