Mercurial > vim
comparison src/vim.h @ 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 | f5d9eb512f8b |
| children | 25c562442f8c |
comparison
equal
deleted
inserted
replaced
| 9283:0b359cb19c27 | 9284:78712a2f687a |
|---|---|
| 1074 | 1074 |
| 1075 /* The type numbers are fixed for backwards compatibility. */ | 1075 /* The type numbers are fixed for backwards compatibility. */ |
| 1076 #define BARTYPE_VERSION 1 | 1076 #define BARTYPE_VERSION 1 |
| 1077 #define BARTYPE_HISTORY 2 | 1077 #define BARTYPE_HISTORY 2 |
| 1078 #define BARTYPE_REGISTER 3 | 1078 #define BARTYPE_REGISTER 3 |
| 1079 | 1079 #define BARTYPE_MARK 4 |
| 1080 #define VIMINFO_VERSION 3 | 1080 |
| 1081 #define VIMINFO_VERSION 4 | |
| 1081 #define VIMINFO_VERSION_WITH_HISTORY 2 | 1082 #define VIMINFO_VERSION_WITH_HISTORY 2 |
| 1082 #define VIMINFO_VERSION_WITH_REGISTERS 3 | 1083 #define VIMINFO_VERSION_WITH_REGISTERS 3 |
| 1084 #define VIMINFO_VERSION_WITH_MARKS 4 | |
| 1083 | 1085 |
| 1084 typedef enum { | 1086 typedef enum { |
| 1085 BVAL_NR, | 1087 BVAL_NR, |
| 1086 BVAL_STRING, | 1088 BVAL_STRING, |
| 1087 BVAL_EMPTY | 1089 BVAL_EMPTY |