Mercurial > vim
diff src/vim.h @ 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 | 26c7bf23ec1d |
| children | 78712a2f687a |
line wrap: on
line diff
--- a/src/vim.h +++ b/src/vim.h @@ -1075,9 +1075,11 @@ extern char *(*dyn_libintl_textdomain)(c /* The type numbers are fixed for backwards compatibility. */ #define BARTYPE_VERSION 1 #define BARTYPE_HISTORY 2 +#define BARTYPE_REGISTER 3 -#define VIMINFO_VERSION 2 +#define VIMINFO_VERSION 3 #define VIMINFO_VERSION_WITH_HISTORY 2 +#define VIMINFO_VERSION_WITH_REGISTERS 3 typedef enum { BVAL_NR, @@ -1085,8 +1087,6 @@ typedef enum { BVAL_EMPTY } btype_T; -#define BVAL_MAX 4 /* Maximum number of fields in a barline. */ - typedef struct { btype_T bv_type; long bv_nr;