summaryrefslogtreecommitdiff
path: root/src/mark.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-10-15 20:46:20 +0200
committerBram Moolenaar <Bram@vim.org>2016-10-15 20:46:20 +0200
commit156919f99afd1ac11d19d4270afbc1afb7245640 (patch)
tree8139401e496e8c04d64e1b5c3758e52f3f5790b0 /src/mark.c
parentca291aec99b60fe81eaab36aa718e51421bb88d5 (diff)
downloadvim-156919f99afd1ac11d19d4270afbc1afb7245640.zip
patch 8.0.0039
Problem: When Vim 8 reads an old viminfo and exits, the next time marks are not read from viminfo. (Ned Batchelder) Solution: Set a mark when it wasn't set before, even when the timestamp is zero. (closes #1170)
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 0627a7cea..9c84bc40d 100644
--- a/src/mark.c
+++ b/src/mark.c
@@ -1597,7 +1597,8 @@ handle_viminfo_mark(garray_T *values, int force)
if (fm != NULL)
{
- if (vi_namedfm != NULL || fm->time_set < timestamp || force)
+ if (vi_namedfm != NULL || fm->fmark.mark.lnum == 0
+ || fm->time_set < timestamp || force)
{
fm->fmark.mark.lnum = lnum;
fm->fmark.mark.col = col;