To: vim_dev@googlegroups.com
Subject: Patch 8.2.0706
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 8.2.0706
Problem:    Vim9: using assert_fails() causes function to finish.
Solution:   Check did_emsg instead of called_emsg.
Files:      src/vim9execute.c, src/testdir/test_vim9_disassemble.vim,
            src/testdir/test_vim9_script.vim


*** ../vim-8.2.0705/src/vim9execute.c	2020-05-06 22:18:13.862658361 +0200
--- src/vim9execute.c	2020-05-07 13:21:21.219810389 +0200
***************
*** 458,464 ****
  {
      typval_T	argvars[MAX_FUNC_ARGS];
      int		idx;
!     int		called_emsg_before = called_emsg;
  
      if (call_prepare(argcount, argvars, ectx) == FAIL)
  	return FAIL;
--- 458,464 ----
  {
      typval_T	argvars[MAX_FUNC_ARGS];
      int		idx;
!     int		did_emsg_before = did_emsg;
  
      if (call_prepare(argcount, argvars, ectx) == FAIL)
  	return FAIL;
***************
*** 470,476 ****
      for (idx = 0; idx < argcount; ++idx)
  	clear_tv(&argvars[idx]);
  
!     if (called_emsg != called_emsg_before)
  	return FAIL;
      return OK;
  }
--- 470,476 ----
      for (idx = 0; idx < argcount; ++idx)
  	clear_tv(&argvars[idx]);
  
!     if (did_emsg != did_emsg_before)
  	return FAIL;
      return OK;
  }
*** ../vim-8.2.0705/src/testdir/test_vim9_disassemble.vim	2020-05-06 21:06:26.425435628 +0200
--- src/testdir/test_vim9_disassemble.vim	2020-05-07 13:24:15.335018885 +0200
***************
*** 17,22 ****
--- 17,23 ----
    buffers
    echo arg
    echo local
+   echo &lines
    echo v:version
    echo s:scriptvar
    echo g:globalvar
***************
*** 42,47 ****
--- 43,49 ----
          ' EXEC \+buffers.*' ..
          ' LOAD arg\[-1\].*' ..
          ' LOAD $0.*' ..
+         ' LOADOPT &lines.*' ..
          ' LOADV v:version.*' ..
          ' LOADS s:scriptvar from .*test_vim9_disassemble.vim.*' ..
          ' LOADG g:globalvar.*' ..
*** ../vim-8.2.0705/src/testdir/test_vim9_script.vim	2020-05-05 23:32:54.556322970 +0200
--- src/testdir/test_vim9_script.vim	2020-05-07 14:06:11.888509980 +0200
***************
*** 1311,1323 ****
        'catch /pat/# comment',
        'endtry',
        ], 'E488:')
-   CheckScriptFailure([
-       'vim9script',
-       'try',
-       '  throw "pat"',
-       'catch /pat/# comment',
-       'endtry',
-       ], 'E605:')
    CheckDefFailure([
        'try',
        'echo "yes"',
--- 1311,1316 ----
*** ../vim-8.2.0705/src/version.c	2020-05-06 22:25:01.817277680 +0200
--- src/version.c	2020-05-07 13:32:33.356969122 +0200
***************
*** 748,749 ****
--- 748,751 ----
  {   /* Add new patch number below this line */
+ /**/
+     706,
  /**/

-- 
"I don’t know how to make a screenshot" - Richard Stallman, July 2002
(when asked to send a screenshot of his desktop for unix.se)

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///