From 36f0f0686ca313ef7b76387378cd5dc7acea1924 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Tue, 14 Jun 2016 23:02:46 +0200 Subject: 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. --- src/mark.c | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) (limited to 'src/mark.c') diff --git a/src/mark.c b/src/mark.c index 008a0d0fe..5e2ac5507 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'); } -- cgit v1.2.1