vim-patch:8.2.0035: saving and restoring called_emsg is clumsy (#19335)

Problem:    Saving and restoring called_emsg is clumsy.
Solution:   Count the number of error messages.
https://github.com/vim/vim/commit/53989554a44caca0964376d60297f08ec257c53c

1 files changed, 2 insertions, 3 deletions

diff --git a/src/nvim/testing.c b/src/nvim/testing.c
index 9207ebe73b..80e39baafc 100644
--- a/src/nvim/testing.c
+++ b/src/nvim/testing.c
@@ -405,15 +405,15 @@ void f_assert_fails(typval_T *argvars, typval_T *rettv, FunPtr fptr)
   const char *const cmd = tv_get_string_chk(&argvars[0]);
   garray_T ga;
   int save_trylevel = trylevel;
+  const int called_emsg_before = called_emsg;
 
   // trylevel must be zero for a ":throw" command to be considered failed
   trylevel = 0;
-  called_emsg = false;
   suppress_errthrow = true;
   emsg_silent = true;
 
   do_cmdline_cmd(cmd);
-  if (!called_emsg) {
+  if (called_emsg == called_emsg_before) {
     prepare_assert_error(&ga);
     ga_concat(&ga, "command did not fail: ");
     assert_append_cmd_or_arg(&ga, argvars, cmd);
@@ -438,7 +438,6 @@ void f_assert_fails(typval_T *argvars, typval_T *rettv, FunPtr fptr)
   }
 
   trylevel = save_trylevel;
-  called_emsg = false;
   suppress_errthrow = false;
   emsg_silent = false;
   emsg_on_display = false;