diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-06-09 20:24:28 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-06-09 20:24:28 +0200 |
| commit | 1fd99c1ca89a3d13bb53aff4a5a8f5ee740713e5 (patch) | |
| tree | 756a88225b31fe0bef957aa4c262de47e241416f /src/ex_cmds.c | |
| parent | abc70bbf363dbbe3f2bf714102f55648a512791e (diff) | |
patch 7.4.1911v7.4.1911
Problem: Recent history lines may be lost when exiting Vim.
Solution: Merge history using the timestamp.
Diffstat (limited to 'src/ex_cmds.c')
| -rw-r--r-- | src/ex_cmds.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/ex_cmds.c b/src/ex_cmds.c index 62b39a2d89..2c7742eab8 100644 --- a/src/ex_cmds.c +++ b/src/ex_cmds.c @@ -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. */ |