diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-06-13 21:16:03 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-06-13 21:16:03 +0200 |
| commit | a641e1d4da3f9152c489318c06a93fcd1c746637 (patch) | |
| tree | 198fb5c05f818cb2c3bcbf23e9bb2239c7525722 | |
| parent | bf2c0ee0b2e8465847cf67aff22dd4bda7be81d1 (diff) | |
| download | vim-git-a641e1d4da3f9152c489318c06a93fcd1c746637.tar.gz | |
patch 7.4.1931v7.4.1931
Problem: Using both old and new style file mark lines from viminfo.
Solution: Skip the old style lines if the viminfo file was written with a
Vim version that supports the new style.
| -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 519f40c16..ec405cb43 100644 --- a/src/ex_cmds.c +++ b/src/ex_cmds.c @@ -2310,7 +2310,11 @@ read_viminfo_up_to_marks( break; case '-': case '\'': - eof = read_viminfo_filemark(virp, forceit); + /* When file marks are in bar lines skip the old style lines. */ + if (virp->vir_version < VIMINFO_VERSION_WITH_MARKS) + eof = read_viminfo_filemark(virp, forceit); + else + eof = viminfo_readline(virp); break; default: if (viminfo_error("E575: ", _("Illegal starting char"), diff --git a/src/version.c b/src/version.c index b58bc3c34..977cb1a80 100644 --- a/src/version.c +++ b/src/version.c @@ -754,6 +754,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1931, +/**/ 1930, /**/ 1929, |