From 64150517967fbe7fb111320c3dc1d16528aa547b Mon Sep 17 00:00:00 2001 From: Sean Dewar Date: Sat, 9 Oct 2021 02:52:21 +0100 Subject: [PATCH] refactor(ex_eval): cherry-pick CSF flags changes from v8.2.3099 https://github.com/vim/vim/commit/4197828dc666f2d258594f7f9461534d23cc50e4 Cherry-pick the changes to existing flags values. Required for v8.2.3478. That patch mostly relates to Vim9script, but I'm careful not to mark it N/A in case the flags have some use outside of Vim9 in the future. Excludes CSF_FUNC_DEF (flag introduced in v8.2.1870 for Vim9's block scopes). --- src/nvim/ex_eval.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/nvim/ex_eval.h b/src/nvim/ex_eval.h index 15da4b2d60..07247ea7d5 100644 --- a/src/nvim/ex_eval.h +++ b/src/nvim/ex_eval.h @@ -14,9 +14,9 @@ #define CSF_TRY 0x0100 // is a ":try" #define CSF_FINALLY 0x0200 // ":finally" has been passed -#define CSF_THROWN 0x0400 // exception thrown to this try conditional -#define CSF_CAUGHT 0x0800 // exception caught by this try conditional -#define CSF_SILENT 0x1000 // "emsg_silent" reset by ":try" +#define CSF_THROWN 0x0800 // exception thrown to this try conditional +#define CSF_CAUGHT 0x1000 // exception caught by this try conditional +#define CSF_SILENT 0x2000 // "emsg_silent" reset by ":try" // Note that CSF_ELSE is only used when CSF_TRY and CSF_WHILE are unset // (an ":if"), and CSF_SILENT is only used when CSF_TRY is set.