From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 2 Jul 2016 17:20:06 +0000 (+0200)
Subject: patch 7.4.1982
X-Git-Tag: v7.4.1982
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=951fa1819ad0e74d73e885d0ec04dd6c70f8d2f7;p=vim

patch 7.4.1982
Problem:    Viminfo file contains duplicate change marks.
Solution:   Drop duplicate marks.
---

diff --git a/src/mark.c b/src/mark.c
index 264124f59..2e8fdd63f 100644
--- a/src/mark.c
+++ b/src/mark.c
@@ -1859,7 +1859,12 @@ write_viminfo_marks(FILE *fp_out)
 #ifdef FEAT_JUMPLIST
 		/* changelist positions are stored oldest first */
 		for (i = 0; i < buf->b_changelistlen; ++i)
-		    write_one_mark(fp_out, '+', &buf->b_changelist[i]);
+		{
+		    /* skip duplicates */
+		    if (i == 0 || !equalpos(buf->b_changelist[i - 1],
+							buf->b_changelist[i]))
+			write_one_mark(fp_out, '+', &buf->b_changelist[i]);
+		}
 #endif
 		for (i = 0; i < NMARKS; i++)
 		    write_one_mark(fp_out, 'a' + i, &buf->b_namedm[i]);
diff --git a/src/version.c b/src/version.c
index f8b6fff27..8d9995aef 100644
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1982,
 /**/
     1981,
 /**/