From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 4 Jan 2011 18:25:50 +0000 (+0100)
Subject: updated for version 7.3.098
X-Git-Tag: v7.3.098
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fd0e75683f248070496b0e315052ccfcfe7dee26;p=vim

updated for version 7.3.098
Problem:    Function that ignores error still causes called_emsg to be set.
            E.g. when expand() fails the status line is disabled.
Solution:   Move check for emsg_not_now() up. (James Vega)
---

diff --git a/src/message.c b/src/message.c
index ac81948f2..930fca117 100644
--- a/src/message.c
+++ b/src/message.c
@@ -569,6 +569,10 @@ emsg(s)
     int		severe;
 #endif
 
+    /* Skip this if not giving error messages at the moment. */
+    if (emsg_not_now())
+	return TRUE;
+
     called_emsg = TRUE;
     ex_exitval = 1;
 
@@ -581,10 +585,6 @@ emsg(s)
     emsg_severe = FALSE;
 #endif
 
-    /* Skip this if not giving error messages at the moment. */
-    if (emsg_not_now())
-	return TRUE;
-
     if (!emsg_off || vim_strchr(p_debug, 't') != NULL)
     {
 #ifdef FEAT_EVAL
diff --git a/src/version.c b/src/version.c
index 05e50df55..3c12b2fa1 100644
--- a/src/version.c
+++ b/src/version.c
@@ -714,6 +714,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    98,
 /**/
     97,
 /**/