From: Bram Moolenaar <Bram@vim.org>
Date: Sun, 7 Feb 2016 18:46:12 +0000 (+0100)
Subject: patch 7.4.1282
X-Git-Tag: v7.4.1282
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=768ce2435ae956041579ef2d26e3e9d3a2444e1e;p=thirdparty%2Fvim.git

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
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
@@ -747,6 +747,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1282,
 /**/
     1281,
 /**/