Mercurial > vim
diff src/proto/mark.pro @ 9284:78712a2f687a v7.4.1925
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Jun 12 21:20:54 2016 +0200
patch 7.4.1925
Problem: Viminfo does not merge file marks properly.
Solution: Use a timestamp. Add the :clearjumps command.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sun, 12 Jun 2016 21:30:06 +0200 |
| parents | 21b0a39d13ed |
| children | 1003973c99df |
line wrap: on
line diff
--- a/src/proto/mark.pro +++ b/src/proto/mark.pro @@ -16,6 +16,7 @@ char_u *fm_getname(fmark_T *fmark, int l 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);