Mercurial > vim

changeset 2679:763272b18e4f v7.3.098

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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)
author Bram Moolenaar <bram@vim.org>
date Tue, 04 Jan 2011 19:25:50 +0100
parents faf4b09c396e
children 27621abffed2
files src/message.c src/version.c
diffstat 2 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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
--- a/src/version.c
+++ b/src/version.c
@@ -715,6 +715,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    98,
+/**/
     97,
 /**/
     96,