1
0
forked from aniani/vim

updated for version 7.3.892

Problem:    Still mering problems for viminfo history.
Solution:   Do not merge lines when writing, don't write old viminfo lines.
This commit is contained in:
Bram Moolenaar
2013-04-14 23:19:36 +02:00
parent 6f852a557d
commit 07219f911c
4 changed files with 27 additions and 13 deletions

View File

@@ -2113,7 +2113,7 @@ read_viminfo_up_to_marks(virp, forceit, writing)
buf_T *buf;
#ifdef FEAT_CMDHIST
prepare_viminfo_history(forceit ? 9999 : 0);
prepare_viminfo_history(forceit ? 9999 : 0, writing);
#endif
eof = viminfo_readline(virp);
while (!eof && virp->vir_line[0] != '>')
@@ -2161,7 +2161,7 @@ read_viminfo_up_to_marks(virp, forceit, writing)
case '=':
case '@':
#ifdef FEAT_CMDHIST
eof = read_viminfo_history(virp);
eof = read_viminfo_history(virp, writing);
#else
eof = viminfo_readline(virp);
#endif
@@ -2182,7 +2182,8 @@ read_viminfo_up_to_marks(virp, forceit, writing)
#ifdef FEAT_CMDHIST
/* Finish reading history items. */
finish_viminfo_history();
if (!writing)
finish_viminfo_history();
#endif
/* Change file names to buffer numbers for fmarks. */