summaryrefslogtreecommitdiff
path: root/src/viminfo.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-12-27 17:33:26 +0100
committerBram Moolenaar <Bram@vim.org>2019-12-27 17:33:26 +0100
commit8cd6cd8087ccf08e4303dbf5f732fc4b82b917e1 (patch)
tree3db4f208a27870f88bc8bfe4a290caa2b33062bb /src/viminfo.c
parent297610ba4b110c918ffe60c45eb4a1d6ea2daae5 (diff)
downloadvim-git-8cd6cd8087ccf08e4303dbf5f732fc4b82b917e1.tar.gz
patch 8.2.0050: after deleting a file mark it is still in viminfov8.2.0050
Problem: After deleting a file mark it is still in viminfo. Solution: When a file mark was deleted more recently than the mark in the merged viminfo file was updated, do not store the mark. (Pavol Juhas, closes #5401, closes #1339)
Diffstat (limited to 'src/viminfo.c')
-rw-r--r--src/viminfo.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/viminfo.c b/src/viminfo.c
index fd2be5f5c..308a9a609 100644
--- a/src/viminfo.c
+++ b/src/viminfo.c
@@ -2055,8 +2055,7 @@ write_viminfo_filemarks(FILE *fp)
for (i = 0; i < NMARKS; i++)
{
if (vi_namedfm != NULL
- && (vi_namedfm[i].time_set > namedfm_p[i].time_set
- || namedfm_p[i].fmark.mark.lnum == 0))
+ && (vi_namedfm[i].time_set > namedfm_p[i].time_set))
fm = &vi_namedfm[i];
else
fm = &namedfm_p[i];