Permalink
Browse files

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)
  • Loading branch information...
1 parent ca291ae commit 156919f99afd1ac11d19d4270afbc1afb7245640 @brammool brammool committed Oct 15, 2016
Showing with 27 additions and 4 deletions.
  1. +2 −1 src/mark.c
  2. +23 −3 src/testdir/test_viminfo.vim
  3. +2 −0 src/version.c
View
@@ -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;
@@ -1,6 +1,6 @@
" Test for reading and writing .viminfo
-function Test_read_and_write()
+function Test_viminfo_read_and_write()
call histdel(':')
let lines = [
\ '# comment line',
@@ -17,7 +17,7 @@ function Test_read_and_write()
let lines = readfile('Xviminfo')
let done = 0
for line in lines
- if line[0] == '|' && line !~ '^|[234],'
+ if line[0] == '|' && line !~ '^|[234],' && line !~ '^|<'
if done == 0
call assert_equal('|1,4', line)
elseif done == 1
@@ -469,7 +469,27 @@ func Test_viminfo_file_mark_tabclose()
silent! bwipe Xtestfileintab
endfunc
-func Test_oldfiles()
+func Test_viminfo_file_mark_zero_time()
+ let lines = [
+ \ '# Viminfo version',
+ \ '|1,4',
+ \ '',
+ \ '*encoding=utf-8',
+ \ '',
+ \ '# File marks:',
+ \ "'B 1 0 /tmp/nothing",
+ \ '|4,66,1,0,0,"/tmp/nothing"',
+ \ "",
+ \ ]
+ call writefile(lines, 'Xviminfo')
+ delmark B
+ rviminfo Xviminfo
+ call delete('Xviminfo')
+ call assert_equal(1, line("'B"))
+ delmark B
+endfunc
+
+func Test_viminfo_oldfiles()
let v:oldfiles = []
let lines = [
\ '# comment line',
View
@@ -765,6 +765,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 39,
+/**/
38,
/**/
37,

0 comments on commit 156919f

Please sign in to comment.