Mercurial > vim
comparison src/version.c @ 9299:8000f0a44744 v7.4.1932
commit https://github.com/vim/vim/commit/ece74ab103eca15e17435efbe9cb21039787f1ea
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon Jun 13 22:22:15 2016 +0200
patch 7.4.1932
Problem: When writing viminfo the jumplist is not merged with the one in
the viminfo file.
Solution: Merge based on timestamp.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Mon, 13 Jun 2016 22:30:05 +0200 |
| parents | 9c663cda189f |
| children | c3805fb080a6 |
comparison
equal
deleted
inserted
replaced
| 9298:ddcef7b7874a | 9299:8000f0a44744 |
|---|---|
| 751 NULL | 751 NULL |
| 752 }; | 752 }; |
| 753 | 753 |
| 754 static int included_patches[] = | 754 static int included_patches[] = |
| 755 { /* Add new patch number below this line */ | 755 { /* Add new patch number below this line */ |
| 756 /**/ | |
| 757 1932, | |
| 756 /**/ | 758 /**/ |
| 757 1931, | 759 1931, |
| 758 /**/ | 760 /**/ |
| 759 1930, | 761 1930, |
| 760 /**/ | 762 /**/ |