diff options
| author | Bram Moolenaar <Bram@vim.org> | 2009-05-16 15:31:32 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2009-05-16 15:31:32 +0000 |
| commit | af0167fa3917bcaf4e066a08977068b1964ac78d (patch) | |
| tree | 8d99a0dc0e3b95b8a9404728841943f843142573 /src/ex_eval.c | |
| parent | 8f0b2d46c7020c2ae097c748940f74b3af1383f7 (diff) | |
updated for version 7.2-177v7.2.177
Diffstat (limited to 'src/ex_eval.c')
| -rw-r--r-- | src/ex_eval.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/ex_eval.c b/src/ex_eval.c index a821ef8546..fc23cace20 100644 --- a/src/ex_eval.c +++ b/src/ex_eval.c @@ -60,7 +60,9 @@ static char_u *get_end_emsg __ARGS((struct condstack *cstack)); #else /* Values used for the Vim release. */ # define THROW_ON_ERROR TRUE +# define THROW_ON_ERROR_TRUE # define THROW_ON_INTERRUPT TRUE +# define THROW_ON_INTERRUPT_TRUE #endif static void catch_exception __ARGS((except_T *excp)); @@ -1320,16 +1322,20 @@ do_throw(cstack) * and reset the did_emsg or got_int flag, so this won't happen again at * the next surrounding try conditional. */ +#ifndef THROW_ON_ERROR_TRUE if (did_emsg && !THROW_ON_ERROR) { inactivate_try = TRUE; did_emsg = FALSE; } +#endif +#ifndef THROW_ON_INTERRUPT_TRUE if (got_int && !THROW_ON_INTERRUPT) { inactivate_try = TRUE; got_int = FALSE; } +#endif idx = cleanup_conditionals(cstack, 0, inactivate_try); if (idx >= 0) { @@ -2254,10 +2260,9 @@ rewind_conditionals(cstack, idx, cond_type, cond_level) /* * ":endfunction" when not after a ":function" */ -/*ARGSUSED*/ void ex_endfunction(eap) - exarg_T *eap; + exarg_T *eap UNUSED; { EMSG(_("E193: :endfunction not inside a function")); } |