commit 89dcb4dce369de22fba13b9c3c63f11f8d42650b
author mityu <mityu.mail@gmail.com> Fri May 28 13:50:17 2021 +0200
committer Bram Moolenaar <Bram@vim.org> Fri May 28 13:50:17 2021 +0200
tree 15ebbcd1322f10e05c3036dafb771fabf03e8b08
parent 543467136f001708f4c63376ac5d18adde82db30

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)

src/eval.c

diff --git a/src/eval.c b/src/eval.c
index b5820b8..f75263d 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -2934,7 +2934,7 @@
 	 */
 	if (evaluate && vim9script && !IS_WHITE_OR_NUL((*arg)[oplen]))
 	{
-	    error_white_both(p, oplen);
+	    error_white_both(*arg, oplen);
 	    clear_tv(rettv);
 	    return FAIL;
 	}

src/testdir/test_vim9_expr.vim

diff --git a/src/testdir/test_vim9_expr.vim b/src/testdir/test_vim9_expr.vim
index 3ca1f34..f1762d7 100644
--- a/src/testdir/test_vim9_expr.vim
+++ b/src/testdir/test_vim9_expr.vim
@@ -1220,7 +1220,14 @@
   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

src/version.c

diff --git a/src/version.c b/src/version.c
index 775c4f4..fb8a7ad 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2892,
+/**/
     2891,
 /**/
     2890,