Mercurial > vim
comparison src/proto/ops.pro @ 9272:f5d9eb512f8b v7.4.1919
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Jun 11 21:04:39 2016 +0200
patch 7.4.1919
Problem: Register contents is not merged when writing viminfo.
Solution: Use timestamps for register contents.
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Sat, 11 Jun 2016 21:15:05 +0200 |
parents | 21b0a39d13ed |
children | 80ace3687eec |
comparison
equal
deleted
inserted
replaced
9271:d10d373d488e | 9272:f5d9eb512f8b |
---|---|
42 void op_formatexpr(oparg_T *oap); | 42 void op_formatexpr(oparg_T *oap); |
43 int fex_format(linenr_T lnum, long count, int c); | 43 int fex_format(linenr_T lnum, long count, int c); |
44 void format_lines(linenr_T line_count, int avoid_fex); | 44 void format_lines(linenr_T line_count, int avoid_fex); |
45 int paragraph_start(linenr_T lnum); | 45 int paragraph_start(linenr_T lnum); |
46 void op_addsub(oparg_T *oap, linenr_T Prenum1, int g_cmd); | 46 void op_addsub(oparg_T *oap, linenr_T Prenum1, int g_cmd); |
47 void prepare_viminfo_registers(void); | |
48 void finish_viminfo_registers(void); | |
47 int read_viminfo_register(vir_T *virp, int force); | 49 int read_viminfo_register(vir_T *virp, int force); |
50 void handle_viminfo_register(garray_T *values, int writing); | |
48 void write_viminfo_registers(FILE *fp); | 51 void write_viminfo_registers(FILE *fp); |
49 void x11_export_final_selection(void); | 52 void x11_export_final_selection(void); |
50 void clip_free_selection(VimClipboard *cbd); | 53 void clip_free_selection(VimClipboard *cbd); |
51 void clip_get_selection(VimClipboard *cbd); | 54 void clip_get_selection(VimClipboard *cbd); |
52 void clip_yank_selection(int type, char_u *str, long len, VimClipboard *cbd); | 55 void clip_yank_selection(int type, char_u *str, long len, VimClipboard *cbd); |