# HG changeset patch # User Christian Brabandt # Date 1454871604 -3600 # Node ID 00344cd730f666996f2489306c5378436fda5244 # Parent 629c08a7eaff3aa5cc41678226e22227c3deaf3f commit https://github.com/vim/vim/commit/768ce2435ae956041579ef2d26e3e9d3a2444e1e Author: Bram Moolenaar Date: Sun Feb 7 19:46:12 2016 +0100 patch 7.4.1282 Problem: Crash when evaluating the pattern of ":catch" causes an error. (Dominique Pelle) Solution: Block error messages at this point. diff --git a/src/ex_eval.c b/src/ex_eval.c --- 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 --- 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,