diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-07-02 22:33:46 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-07-02 22:33:46 +0200 |
| commit | dec85cf75044ed94f611c825a7a0b0050a2597b9 (patch) | |
| tree | e46802444d0df51308894dc70142df8fc32be86e | |
| parent | fef524bbff9aa186838c35212b2f89f61d627cf8 (diff) | |
| download | vim-git-dec85cf75044ed94f611c825a7a0b0050a2597b9.tar.gz | |
patch 7.4.1987v7.4.1987
Problem: When copying unrecognized lines for viminfo, end up with useless
continuation lines.
Solution: Skip continuation lines.
| -rw-r--r-- | src/ex_cmds.c | 12 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 13 insertions, 1 deletions
diff --git a/src/ex_cmds.c b/src/ex_cmds.c index e7b3b2865..72603d1bd 100644 --- a/src/ex_cmds.c +++ b/src/ex_cmds.c @@ -2834,13 +2834,23 @@ write_viminfo_barlines(vir_T *virp, FILE *fp_out) { int i; garray_T *gap = &virp->vir_barlines; + int seen_useful = FALSE; + char *line; if (gap->ga_len > 0) { fputs(_("\n# Bar lines, copied verbatim:\n"), fp_out); + /* Skip over continuation lines until seeing a useful line. */ for (i = 0; i < gap->ga_len; ++i) - fputs(((char **)(gap->ga_data))[i], fp_out); + { + line = ((char **)(gap->ga_data))[i]; + if (seen_useful || line[1] != '<') + { + fputs(line, fp_out); + seen_useful = TRUE; + } + } } } #endif /* FEAT_VIMINFO */ diff --git a/src/version.c b/src/version.c index 8a7c8d774..0a720cd1e 100644 --- a/src/version.c +++ b/src/version.c @@ -759,6 +759,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1987, +/**/ 1986, /**/ 1985, |