summaryrefslogtreecommitdiffstats
path: root/src/globals.h
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-09-06 23:40:10 +0200
committerBram Moolenaar <Bram@vim.org>2017-09-06 23:40:10 +0200
commite723c42836d971180d1bf9f98916966c5543fff1 (patch)
treeeced5c296dc3ea756078cb48cfdfe95f3f5d0446 /src/globals.h
parent2e49b6b20c3d7229edf41ac03931ce32ce0f7bd8 (diff)
patch 8.0.1067: try/catch in timer does not prevent it from being stoppedv8.0.1067
Problem: Using try/catch in timer does not prevent it from being stopped. Solution: Reset the exception context and use did_emsg instead of called_emsg.
Diffstat (limited to 'src/globals.h')
-rw-r--r--src/globals.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/globals.h b/src/globals.h
index 0b887d35bb..ac2727f7c8 100644
--- a/src/globals.h
+++ b/src/globals.h
@@ -182,6 +182,10 @@ EXTERN dict_T globvardict; /* Dictionary with g: variables */
#endif
EXTERN int did_emsg; /* set by emsg() when the message
is displayed or thrown */
+#ifdef FEAT_EVAL
+EXTERN int did_uncaught_emsg; /* emsg() was called and did not
+ cause an exception */
+#endif
EXTERN int did_emsg_syntax; /* did_emsg set because of a
syntax error */
EXTERN int called_emsg; /* always set by emsg() */