summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-03-06 14:58:28 +0100
committerBram Moolenaar <Bram@vim.org>2016-03-06 14:58:28 +0100
commit9ef00be261115acb5bae3b3ca45c1d86a19ba2c7 (patch)
tree75806efb87451232bf5867e833aaef597d45733a
parentbe82c254862e475a582c0717455e1db6bf96b0d0 (diff)
downloadvim-git-9ef00be261115acb5bae3b3ca45c1d86a19ba2c7.tar.gz
patch 7.4.1500v7.4.1500
Problem: Should_free flag set to FALSE. Solution: Set it to TRUE. (Neovim 4415)
-rw-r--r--src/ex_eval.c4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/ex_eval.c b/src/ex_eval.c
index c68c6ad18..3fd470c10 100644
--- a/src/ex_eval.c
+++ b/src/ex_eval.c
@@ -432,7 +432,7 @@ get_exception_string(
if (type == ET_ERROR)
{
- *should_free = FALSE;
+ *should_free = TRUE;
mesg = ((struct msglist *)value)->throw_msg;
if (cmdname != NULL && *cmdname != NUL)
{
@@ -489,7 +489,7 @@ get_exception_string(
else
{
*should_free = FALSE;
- ret = (char_u *) value;
+ ret = (char_u *)value;
}
return ret;
diff --git a/src/version.c b/src/version.c
index 6ce39932a..106fa2081 100644
--- a/src/version.c
+++ b/src/version.c
@@ -744,6 +744,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1500,
+/**/
1499,
/**/
1498,