summaryrefslogtreecommitdiffstats
path: root/src/globals.h
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-10-28 20:20:00 +0100
committerBram Moolenaar <Bram@vim.org>2020-10-28 20:20:00 +0100
commit28ee892ac4197421b3317f195512ca64cc56a5b4 (patch)
tree0a9eb799ec0e55a32600cc604cea653d9b91f322 /src/globals.h
parent3e2534ed1a6557445747e6c1439ad26ec8eabfc4 (diff)
patch 8.2.1919: assert_fails() setting emsg_silent changes normal executionv8.2.1919
Problem: Assert_fails() setting emsg_silent changes normal execution. Solution: Use a separate flag in_assert_fails.
Diffstat (limited to 'src/globals.h')
-rw-r--r--src/globals.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/globals.h b/src/globals.h
index 5495eac13b..5bdbad636f 100644
--- a/src/globals.h
+++ b/src/globals.h
@@ -221,7 +221,6 @@ EXTERN int emsg_skip INIT(= 0); // don't display errors for
EXTERN int emsg_severe INIT(= FALSE); // use message of next of several
// emsg() calls for throw
// used by assert_fails()
-EXTERN int emsg_assert_fails_used INIT(= FALSE);
EXTERN char_u *emsg_assert_fails_msg INIT(= NULL);
EXTERN long emsg_assert_fails_lnum INIT(= 0);
EXTERN char_u *emsg_assert_fails_context INIT(= NULL);
@@ -1130,6 +1129,8 @@ EXTERN int emsg_silent INIT(= 0); // don't print error messages
EXTERN int emsg_noredir INIT(= 0); // don't redirect error messages
EXTERN int cmd_silent INIT(= FALSE); // don't echo the command line
+EXTERN int in_assert_fails INIT(= FALSE); // assert_fails() active
+
EXTERN int swap_exists_action INIT(= SEA_NONE);
// For dialog when swap file already
// exists.