Patch 8.2.2892
Problem:    Error message contains random characters.
Solution:   Pass the right pointer to error_white_both(). (closes #8272,
            closes #8263)
Files:      src/eval.c, src/testdir/test_vim9_expr.vim


*** ../vim-8.2.2891/src/eval.c  2021-05-18 15:09:13.967782682 +0200
--- src/eval.c  2021-05-28 13:39:58.346037857 +0200
***************
*** 2934,2940 ****
         */
        if (evaluate && vim9script && !IS_WHITE_OR_NUL((*arg)[oplen]))
        {
!           error_white_both(p, oplen);
            clear_tv(rettv);
            return FAIL;
        }
--- 2934,2940 ----
         */
        if (evaluate && vim9script && !IS_WHITE_OR_NUL((*arg)[oplen]))
        {
!           error_white_both(*arg, oplen);
            clear_tv(rettv);
            return FAIL;
        }
*** ../vim-8.2.2891/src/testdir/test_vim9_expr.vim      2021-05-25 
20:13:56.316778428 +0200
--- src/testdir/test_vim9_expr.vim      2021-05-28 13:47:54.449389275 +0200
***************
*** 1220,1226 ****
    lines =<< trim END
        echo 'a'.. 'b'
    END
!   CheckDefAndScriptFailure(lines, 'E1004:', 1)
  
    # check invalid string concatenation
    lines =<< trim END
--- 1220,1233 ----
    lines =<< trim END
        echo 'a'.. 'b'
    END
!   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
*** ../vim-8.2.2891/src/version.c       2021-05-27 18:05:10.124200971 +0200
--- src/version.c       2021-05-28 13:41:19.529975364 +0200
***************
*** 752,753 ****
--- 752,755 ----
  {   /* Add new patch number below this line */
+ /**/
+     2892,
  /**/

-- 
We learn from our mistakes.  Politicians don't make mistakes.

 /// Bram Moolenaar -- b...@moolenaar.net -- http://www.Moolenaar.net   \\\
///                                                                      \\\
\\\        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///

-- 
-- 
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php

--- 
You received this message because you are subscribed to the Google Groups 
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to vim_dev+unsubscr...@googlegroups.com.
To view this discussion on the web visit 
https://groups.google.com/d/msgid/vim_dev/202105281151.14SBp2LD1231181%40masaka.moolenaar.net.

Reply via email to