From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 14 Jun 2016 21:02:46 +0000 (+0200)
Subject: patch 7.4.1938
X-Git-Tag: v7.4.1938
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=36f0f0686ca313ef7b76387378cd5dc7acea1924;p=thirdparty%2Fvim.git

patch 7.4.1938
Problem:    When writing viminfo numbered marks were duplicated.
Solution:   Check for duplicates between current numbered marks and the ones
            read from viminfo.
---

diff --git a/src/mark.c b/src/mark.c
index 008a0d0fec..5e2ac55071 100644
--- a/src/mark.c
+++ b/src/mark.c
@@ -1674,13 +1674,29 @@ write_viminfo_filemarks(FILE *fp)
     idx = NMARKS;
     for (i = NMARKS; i < NMARKS + EXTRA_MARKS; i++)
     {
-	if (vi_namedfm != NULL
-		&& vi_namedfm[vi_idx].fmark.mark.lnum != 0
-		&& (vi_namedfm[vi_idx].time_set > namedfm[idx].time_set
+	xfmark_T *vi_fm = vi_namedfm != NULL ? &vi_namedfm[vi_idx] : NULL;
+
+	if (vi_fm != NULL
+		&& vi_fm->fmark.mark.lnum != 0
+		&& (vi_fm->time_set > namedfm[idx].time_set
 		    || namedfm[idx].fmark.mark.lnum == 0))
-	    fm = &vi_namedfm[vi_idx++];
+	{
+	    fm = vi_fm;
+	    ++vi_idx;
+	}
 	else
+	{
 	    fm = &namedfm[idx++];
+	    if (vi_fm != NULL
+		  && vi_fm->fmark.mark.lnum == fm->fmark.mark.lnum
+		  && vi_fm->time_set == fm->time_set
+		  && ((vi_fm->fmark.fnum != 0
+			  && vi_fm->fmark.fnum == fm->fmark.fnum)
+		      || (vi_fm->fname != NULL
+			  && fm->fname != NULL
+			  && STRCMP(vi_fm->fname, fm->fname) == 0)))
+		++vi_idx;  /* skip duplicate */
+	}
 	write_one_filemark(fp, fm, '\'', i - NMARKS + '0');
     }
 
diff --git a/src/version.c b/src/version.c
index 2cdd14245f..1a2b1f3c26 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 */
+/**/
+    1938,
 /**/
     1937,
 /**/