summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2006-11-28 17:36:37 +0000
committerBram Moolenaar <Bram@vim.org>2006-11-28 17:36:37 +0000
commit4632d298ada36b48738795ecdc44cd7394acd25e (patch)
tree921c0a8d10c2495486d2afd898220bab2cb8dda5
parent3d20ca1ad143b900c5f2628442ae8436c2f9673f (diff)
updated for version 7.0-172v7.0.172
-rw-r--r--src/ex_eval.c9
-rw-r--r--src/version.c2
2 files changed, 8 insertions, 3 deletions
diff --git a/src/ex_eval.c b/src/ex_eval.c
index 8714958f05..441e98dfeb 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 c2f78aa9b5..1bf84d35ba 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 172,
+/**/
171,
/**/
170,