diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-06-12 21:20:54 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-06-12 21:20:54 +0200 |
| commit | 2d35899721da0e9359a9fe1059554f8c4ea7f0c1 (patch) | |
| tree | fcb24c8186d9b23277948cb097e1807830737781 /src/structs.h | |
| parent | cf089463492fab53b2a5d81517829d22f882f82e (diff) | |
| download | vim-git-2d35899721da0e9359a9fe1059554f8c4ea7f0c1.tar.gz | |
patch 7.4.1925v7.4.1925
Problem: Viminfo does not merge file marks properly.
Solution: Use a timestamp. Add the :clearjumps command.
Diffstat (limited to 'src/structs.h')
| -rw-r--r-- | src/structs.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/structs.h b/src/structs.h index ac99e9158..6075ee2e0 100644 --- a/src/structs.h +++ b/src/structs.h @@ -84,7 +84,7 @@ typedef struct file_buffer buf_T; /* forward declaration */ # ifdef FEAT_XCLIPBOARD # include <X11/Intrinsic.h> # endif -# define guicolor_T long_u /* avoid error in prototypes and +# define guicolor_T long_u /* avoid error in prototypes and * make FEAT_TERMGUICOLORS work */ # define INVALCOLOR ((guicolor_T)0x1ffffff) #endif @@ -112,6 +112,9 @@ typedef struct xfilemark { fmark_T fmark; char_u *fname; /* file name, used when fnum == 0 */ +#ifdef FEAT_VIMINFO + time_t time_set; +#endif } xfmark_T; /* |