From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 28 Nov 2006 17:36:37 +0000 (+0000)
Subject: updated for version 7.0-172
X-Git-Tag: v7.0.172
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4632d298ada36b48738795ecdc44cd7394acd25e;p=vim

updated for version 7.0-172
---

diff --git a/src/ex_eval.c b/src/ex_eval.c
index 8714958f0..441e98dfe 100644
--- a/src/ex_eval.c
+++ b/src/ex_eval.c
@@ -340,7 +340,7 @@ do_errthrow(cstack, cmdname)
 
     /* If no exception is to be thrown or the conversion should be done after
      * returning to a previous invocation of do_one_cmd(), do nothing. */
-    if (*msg_list == NULL)
+    if (msg_list == NULL || *msg_list == NULL)
 	return;
 
     if (throw_exception(*msg_list, ET_ERROR, cmdname) == FAIL)
@@ -2026,8 +2026,11 @@ leave_cleanup(csp)
 
 	/* If an error was about to be converted to an exception when
 	 * enter_cleanup() was called, free the message list. */
-	free_msglist(*msg_list);
-	*msg_list = NULL;
+	if (msg_list != NULL)
+	{
+	    free_msglist(*msg_list);
+	    *msg_list = NULL;
+	}
     }
 
     /*
diff --git a/src/version.c b/src/version.c
index c2f78aa9b..1bf84d35b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    172,
 /**/
     171,
 /**/