diff options
-rw-r--r-- | src/ex_eval.c | 4 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/ex_eval.c b/src/ex_eval.c index c8e33c2eee..c68c6ad189 100644 --- a/src/ex_eval.c +++ b/src/ex_eval.c @@ -1562,7 +1562,11 @@ ex_catch(exarg_T *eap) } save_cpo = p_cpo; p_cpo = (char_u *)""; + /* Disable error messages, it will make current_exception + * invalid. */ + ++emsg_off; regmatch.regprog = vim_regcomp(pat, RE_MAGIC + RE_STRING); + --emsg_off; regmatch.rm_ic = FALSE; if (end != NULL) *end = save_char; diff --git a/src/version.c b/src/version.c index f95be69e5c..ffa3346a2e 100644 --- a/src/version.c +++ b/src/version.c @@ -748,6 +748,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1282, +/**/ 1281, /**/ 1280, |