Mercurial > vim

changeset 24707:ad7cac75b2d1 v8.2.2892

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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)
author Bram Moolenaar <Bram@vim.org>
date Fri, 28 May 2021 14:00:05 +0200
parents 4f9856292860
children 46c0305949ee
files src/eval.c src/testdir/test_vim9_expr.vim src/version.c
diffstat 3 files changed, 11 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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;
 	}
--- 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
--- 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,