summaryrefslogtreecommitdiff
path: root/src/mark.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/mark.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/mark.c')
-rw-r--r--src/mark.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mark.c b/src/mark.c
index ba24220ac..e1dbe3a74 100644
--- a/src/mark.c
+++ b/src/mark.c
@@ -854,9 +854,10 @@ ex_delmarks(exarg_T *eap)
else
n = i - 'A';
namedfm[n].fmark.mark.lnum = 0;
+ namedfm[n].fmark.fnum = 0;
VIM_CLEAR(namedfm[n].fname);
#ifdef FEAT_VIMINFO
- namedfm[n].time_set = 0;
+ namedfm[n].time_set = digit ? 0 : vim_time();
#endif
}
}