aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 7.4.1931

Browse Source 
Problem:    Using both old and new style file mark lines from viminfo.
Solution:   Skip the old style lines if the viminfo file was written with a
            Vim version that supports the new style.
This commit is contained in:
Bram Moolenaar 2016-06-13 21:16:03 +02:00
parent bf2c0ee0b2
commit a641e1d4da
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ex_cmds.c
View File

@ -2310,7 +2310,11 @@ read_viminfo_up_to_marks(
break;
case '-':
case '\'':
eof = read_viminfo_filemark(virp, forceit);
/* When file marks are in bar lines skip the old style lines. */
if (virp->vir_version < VIMINFO_VERSION_WITH_MARKS)
eof = read_viminfo_filemark(virp, forceit);
else
eof = viminfo_readline(virp);
break;
default:
if (viminfo_error("E575: ", _("Illegal starting char"),

2
src/version.c
View File

@ -753,6 +753,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1931,
/**/
1930,
/**/