Mercurial > vim

comparison src/viminfo.c @ 18979:de2d1820215a v8.2.0050

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.0050: after deleting a file mark it is still in viminfo Commit: https://github.com/vim/vim/commit/8cd6cd8087ccf08e4303dbf5f732fc4b82b917e1 Author: Bram Moolenaar <Bram@vim.org> Date: Fri Dec 27 17:33:26 2019 +0100 patch 8.2.0050: after deleting a file mark it is still in viminfo 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)
author Bram Moolenaar <Bram@vim.org>
date Fri, 27 Dec 2019 17:45:04 +0100
parents 9e6d5a4abb1c
children ba9f50bfda83
comparison
equal deleted inserted replaced
18978:51c1bf5c3bb0 18979:de2d1820215a
2053 2053
2054 // Write the filemarks 'A - 'Z 2054 // Write the filemarks 'A - 'Z
2055 for (i = 0; i < NMARKS; i++) 2055 for (i = 0; i < NMARKS; i++)
2056 { 2056 {
2057 if (vi_namedfm != NULL 2057 if (vi_namedfm != NULL
2058 && (vi_namedfm[i].time_set > namedfm_p[i].time_set 2058 && (vi_namedfm[i].time_set > namedfm_p[i].time_set))
2059 || namedfm_p[i].fmark.mark.lnum == 0))
2060 fm = &vi_namedfm[i]; 2059 fm = &vi_namedfm[i];
2061 else 2060 else
2062 fm = &namedfm_p[i]; 2061 fm = &namedfm_p[i];
2063 write_one_filemark(fp, fm, '\'', i + 'A'); 2062 write_one_filemark(fp, fm, '\'', i + 'A');
2064 } 2063 }