# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1622203205 -7200
# Node ID ad7cac75b2d19c53c7b3987b6addf32ce7c509bb
# Parent  4f9856292860c1f1b712e1e9a1d9f1f0044037b9
patch 8.2.2892: error message contains random characters

Commit: https://github.com/vim/vim/commit/89dcb4dce369de22fba13b9c3c63f11f8d42650b
Author: mityu <mityu.mail@gmail.com>
Date:   Fri May 28 13:50:17 2021 +0200

    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 https://github.com/vim/vim/issues/8272,
                closes #8263)

diff --git a/src/eval.c b/src/eval.c
--- a/src/eval.c
+++ b/src/eval.c
@@ -2934,7 +2934,7 @@ eval5(char_u **arg, typval_T *rettv, eva
 	 */
 	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
--- 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
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2892,
+/**/
     2891,
 /**/
     2890,