diff options
| author | Bram Moolenaar <Bram@vim.org> | 2008-05-07 11:10:28 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2008-05-07 11:10:28 +0000 |
| commit | a9aafe5c3106b526926f435fd83aea66706ba6d4 (patch) | |
| tree | 406596164a50ed8a32057febb3f87af3c2980ea6 /src | |
| parent | 7a91a4a12ea8271ea8b5cda0b9d8dff2c0bf7e32 (diff) | |
| download | vim-git-a9aafe5c3106b526926f435fd83aea66706ba6d4.tar.gz | |
updated for version 7.1-294v7.1.294
Diffstat (limited to 'src')
| -rw-r--r-- | src/ex_cmds.c | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/ex_cmds.c b/src/ex_cmds.c index a87dab6a6..218ced0f7 100644 --- a/src/ex_cmds.c +++ b/src/ex_cmds.c @@ -1160,6 +1160,7 @@ do_filter(line1, line2, eap, cmd, do_in, do_out) if (!do_out) msg_putchar('\n'); + /* Create the shell command in allocated memory. */ cmd_buf = make_filter_cmd(cmd, itmp, otmp); if (cmd_buf == NULL) goto filterend; @@ -1180,7 +1181,10 @@ do_filter(line1, line2, eap, cmd, do_in, do_out) if (do_out) { if (u_save((linenr_T)(line2), (linenr_T)(line2 + 1)) == FAIL) + { + vim_free(cmd_buf); goto error; + } redraw_curbuf_later(VALID); } read_linecount = curbuf->b_ml.ml_line_count; @@ -4471,7 +4475,7 @@ do_sub(eap) /* * The new text is build up step by step, to avoid too much * copying. There are these pieces: - * sub_firstline The old text, unmodifed. + * sub_firstline The old text, unmodified. * copycol Column in the old text where we started * looking for a match; from here old text still * needs to be copied to the new text. diff --git a/src/version.c b/src/version.c index 341d66114..a46ddaecb 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 */ /**/ + 294, +/**/ 293, /**/ 292, |