summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-03-14 23:45:35 +0100
committerBram Moolenaar <Bram@vim.org>2016-03-14 23:45:35 +0100
commit9eb3bb2930f804c1d428ea4527e136ac9cd9da43 (patch)
tree89da13ef3f62b6bd6f226833b3b47891f52222a0
parent39afdea2035c34239910267978538a3c99b66911 (diff)
patch 7.4.1562v7.4.1562
Problem: ":helptags ALL" crashes. (Lcd) Solution: Don't free twice.
-rw-r--r--src/ex_cmds.c1
-rw-r--r--src/version.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index 55b066152f..b7434774af 100644
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -6859,7 +6859,6 @@ do_helptags(char_u *dirname, int add_help_tags)
|| filecount == 0)
{
EMSG2("E151: No match: %s", NameBuff);
- vim_free(dirname);
return;
}
diff --git a/src/version.c b/src/version.c
index 501287d9da..a323d2c0f8 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 */
/**/
+ 1562,
+/**/
1561,
/**/
1560,