comparison 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
comparison
equal deleted inserted replaced
9283:0b359cb19c27 9284:78712a2f687a
14 void clrallmarks(buf_T *buf); 14 void clrallmarks(buf_T *buf);
15 char_u *fm_getname(fmark_T *fmark, int lead_len); 15 char_u *fm_getname(fmark_T *fmark, int lead_len);
16 void do_marks(exarg_T *eap); 16 void do_marks(exarg_T *eap);
17 void ex_delmarks(exarg_T *eap); 17 void ex_delmarks(exarg_T *eap);
18 void ex_jumps(exarg_T *eap); 18 void ex_jumps(exarg_T *eap);
19 void ex_clearjumps(exarg_T *eap);
19 void ex_changes(exarg_T *eap); 20 void ex_changes(exarg_T *eap);
20 void mark_adjust(linenr_T line1, linenr_T line2, long amount, long amount_after); 21 void mark_adjust(linenr_T line1, linenr_T line2, long amount, long amount_after);
21 void mark_col_adjust(linenr_T lnum, colnr_T mincol, long lnum_amount, long col_amount); 22 void mark_col_adjust(linenr_T lnum, colnr_T mincol, long lnum_amount, long col_amount);
22 void copy_jumplist(win_T *from, win_T *to); 23 void copy_jumplist(win_T *from, win_T *to);
23 void free_jumplist(win_T *wp); 24 void free_jumplist(win_T *wp);
24 void set_last_cursor(win_T *win); 25 void set_last_cursor(win_T *win);
25 void free_all_marks(void); 26 void free_all_marks(void);
26 int read_viminfo_filemark(vir_T *virp, int force); 27 int read_viminfo_filemark(vir_T *virp, int force);
28 void prepare_viminfo_marks(void);
29 void finish_viminfo_marks(void);
30 void handle_viminfo_mark(garray_T *values, int force);
27 void write_viminfo_filemarks(FILE *fp); 31 void write_viminfo_filemarks(FILE *fp);
28 int removable(char_u *name); 32 int removable(char_u *name);
29 int write_viminfo_marks(FILE *fp_out); 33 int write_viminfo_marks(FILE *fp_out);
30 void copy_viminfo_marks(vir_T *virp, FILE *fp_out, int count, int eof, int flags); 34 void copy_viminfo_marks(vir_T *virp, FILE *fp_out, int count, int eof, int flags);
31 /* vim: set ft=c : */ 35 /* vim: set ft=c : */