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 ac81948f2c087ffe86300603dda87f97eb887c04..930fca117cb441710175abfc587adca1f0afba2e 100644 (file)
--- 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 05e50df55309700651df79ca888e327f0bfc0f51..3c12b2fa198af388fc638d49b36cde41dab4387d 100644 (file)
--- 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,
 /**/