From 768ce2435ae956041579ef2d26e3e9d3a2444e1e Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sun, 7 Feb 2016 19:46:12 +0100 Subject: patch 7.4.1282 Problem: Crash when evaluating the pattern of ":catch" causes an error. (Dominique Pelle) Solution: Block error messages at this point. --- src/ex_eval.c | 4 ++++ src/version.c | 2 ++ 2 files changed, 6 insertions(+) diff --git a/src/ex_eval.c b/src/ex_eval.c index c8e33c2ee..c68c6ad18 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 f95be69e5..ffa3346a2 100644 --- a/src/version.c +++ b/src/version.c @@ -747,6 +747,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1282, /**/ 1281, /**/ -- cgit v1.2.1