Mercurial > vim

changeset 9297:9c663cda189f v7.4.1931

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit https://github.com/vim/vim/commit/a641e1d4da3f9152c489318c06a93fcd1c746637 Author: Bram Moolenaar <Bram@vim.org> Date: Mon Jun 13 21:16:03 2016 +0200 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.
author Christian Brabandt <cb@256bit.org>
date Mon, 13 Jun 2016 21:30:08 +0200
parents 0c11300e87ff
children ddcef7b7874a
files src/ex_cmds.c src/version.c
diffstat 2 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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"),
--- 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,