From a641e1d4da3f9152c489318c06a93fcd1c746637 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Mon, 13 Jun 2016 21:16:03 +0200 Subject: [PATCH] patch 7.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. --- src/ex_cmds.c | 6 +++++- src/version.c | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) 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 @@ -753,6 +753,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1931, /**/ 1930, /**/ -- 2.50.1