patch 7.4.1925v7.4.1925

Problem:    Viminfo does not merge file marks properly.
Solution:   Use a timestamp.  Add the :clearjumps command.

1 files changed, 4 insertions, 0 deletions

diff --git a/src/proto/mark.pro b/src/proto/mark.pro
index 9a3e9e9e0d..f24c0355eb 100644
--- a/src/proto/mark.pro
+++ b/src/proto/mark.pro
@@ -16,6 +16,7 @@ char_u *fm_getname(fmark_T *fmark, int lead_len);
 void do_marks(exarg_T *eap);
 void ex_delmarks(exarg_T *eap);
 void ex_jumps(exarg_T *eap);
+void ex_clearjumps(exarg_T *eap);
 void ex_changes(exarg_T *eap);
 void mark_adjust(linenr_T line1, linenr_T line2, long amount, long amount_after);
 void mark_col_adjust(linenr_T lnum, colnr_T mincol, long lnum_amount, long col_amount);
@@ -24,6 +25,9 @@ void free_jumplist(win_T *wp);
 void set_last_cursor(win_T *win);
 void free_all_marks(void);
 int read_viminfo_filemark(vir_T *virp, int force);
+void prepare_viminfo_marks(void);
+void finish_viminfo_marks(void);
+void handle_viminfo_mark(garray_T *values, int force);
 void write_viminfo_filemarks(FILE *fp);
 int removable(char_u *name);
 int write_viminfo_marks(FILE *fp_out);