Patch 7.4.1931
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.
Files:      src/ex_cmds.c


*** ../vim-7.4.1930/src/ex_cmds.c       2016-06-12 21:20:50.937837471 +0200
--- src/ex_cmds.c       2016-06-13 21:03:01.339936350 +0200
***************
*** 2310,2316 ****
                break;
            case '-':
            case '\'':
!               eof = read_viminfo_filemark(virp, forceit);
                break;
            default:
                if (viminfo_error("E575: ", _("Illegal starting char"),
--- 2310,2320 ----
                break;
            case '-':
            case '\'':
!               /* 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"),
*** ../vim-7.4.1930/src/version.c       2016-06-13 20:23:49.909289104 +0200
--- src/version.c       2016-06-13 21:04:01.291290347 +0200
***************
*** 755,756 ****
--- 755,758 ----
  {   /* Add new patch number below this line */
+ /**/
+     1931,
  /**/

-- 
>From "know your smileys":
 +<(:-) The Pope

 /// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///

-- 
-- 
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php

--- 
You received this message because you are subscribed to the Google Groups 
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
For more options, visit https://groups.google.com/d/optout.

Raspunde prin e-mail lui