Mercurial > vim
comparison src/mark.c @ 10285:cd16ef948ad1 v8.0.0039
commit https://github.com/vim/vim/commit/156919f99afd1ac11d19d4270afbc1afb7245640
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Oct 15 20:46:20 2016 +0200
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)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sat, 15 Oct 2016 21:00:04 +0200 |
| parents | 4aead6a9b7a9 |
| children | 44e9340dc604 |
comparison
equal
deleted
inserted
replaced
| 10284:dc7f7a0a1ed4 | 10285:cd16ef948ad1 |
|---|---|
| 1595 fm = &namedfm[idx]; | 1595 fm = &namedfm[idx]; |
| 1596 } | 1596 } |
| 1597 | 1597 |
| 1598 if (fm != NULL) | 1598 if (fm != NULL) |
| 1599 { | 1599 { |
| 1600 if (vi_namedfm != NULL || fm->time_set < timestamp || force) | 1600 if (vi_namedfm != NULL || fm->fmark.mark.lnum == 0 |
| 1601 || fm->time_set < timestamp || force) | |
| 1601 { | 1602 { |
| 1602 fm->fmark.mark.lnum = lnum; | 1603 fm->fmark.mark.lnum = lnum; |
| 1603 fm->fmark.mark.col = col; | 1604 fm->fmark.mark.col = col; |
| 1604 #ifdef FEAT_VIRTUALEDIT | 1605 #ifdef FEAT_VIRTUALEDIT |
| 1605 fm->fmark.mark.coladd = 0; | 1606 fm->fmark.mark.coladd = 0; |