0
0
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00

patch 7.4.1911

Problem:    Recent history lines may be lost when exiting Vim.
Solution:   Merge history using the timestamp.
This commit is contained in:
Bram Moolenaar
2016-06-09 20:24:28 +02:00
parent abc70bbf36
commit 1fd99c1ca8
6 changed files with 204 additions and 45 deletions

View File

@@ -1755,9 +1755,6 @@ static void write_viminfo_version(FILE *fp_out);
static void write_viminfo_barlines(vir_T *virp, FILE *fp_out);
static int viminfo_errcnt;
#define VIMINFO_VERSION 2
#define VIMINFO_VERSION_WITH_HISTORY 2
static int
no_viminfo(void)
{
@@ -2306,7 +2303,7 @@ read_viminfo_up_to_marks(
#ifdef FEAT_CMDHIST
/* Finish reading history items. */
if (!writing)
finish_viminfo_history();
finish_viminfo_history(virp);
#endif
/* Change file names to buffer numbers for fmarks. */