aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Bürgin <676c7473@gmail.com>2015-05-14 00:00:59 +0200
committerDavid Bürgin <676c7473@gmail.com>2015-05-14 09:55:19 +0200
commita0a60e6e97625393bdcbfd2639b471955a103532 (patch)
tree6e66792618b7c8dbb31f2e31c54b905780cef1bc
parentde7332c0f58d822863e9f8bb8db0ea3e061a54bf (diff)
downloadrneovim-a0a60e6e97625393bdcbfd2639b471955a103532.tar.gz
rneovim-a0a60e6e97625393bdcbfd2639b471955a103532.tar.bz2
rneovim-a0a60e6e97625393bdcbfd2639b471955a103532.zip
vim-patch: Mark patches as NA
These changes do not apply because a) they apply to removed code, or b) they address problems to do with #ifdef'ed code. Marks the following patches as NA: - 7.4.610, https://github.com/vim/vim/commit/v7-4-610 - 7.4.618, https://github.com/vim/vim/commit/v7-4-618 - 7.4.619, https://github.com/vim/vim/commit/v7-4-619 - 7.4.621, https://github.com/vim/vim/commit/v7-4-621 - 7.4.622, https://github.com/vim/vim/commit/v7-4-622 - 7.4.625, https://github.com/vim/vim/commit/v7-4-625 - 7.4.626, https://github.com/vim/vim/commit/v7-4-626 - 7.4.638, https://github.com/vim/vim/commit/v7-4-638 - 7.4.647, https://github.com/vim/vim/commit/v7-4-647 - 7.4.648, https://github.com/vim/vim/commit/v7-4-648 - 7.4.650, https://github.com/vim/vim/commit/v7-4-650 One trivial change had already been included, so the patch number was uncommented: - 7.4.599, https://github.com/vim/vim/commit/v7-4-599
-rw-r--r--src/nvim/version.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 019f51eb4d..ccc1d23762 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -133,10 +133,10 @@ static int included_patches[] = {
653,
//652,
//651,
- //650,
+ //650 NA
//649,
- //648,
- //647,
+ //648 NA
+ //647 NA
//646,
//645,
//644,
@@ -145,7 +145,7 @@ static int included_patches[] = {
//641,
//640,
//639,
- //638,
+ //638 NA
637,
636,
//635,
@@ -157,15 +157,15 @@ static int included_patches[] = {
//629,
//628,
//627,
- //626,
- //625,
+ //626 NA
+ //625 NA
//624,
//623,
- //622,
- //621,
+ //622 NA
+ //621 NA
//620,
- //619,
- //618,
+ //619 NA
+ //618 NA
//617,
//616,
615,
@@ -173,7 +173,7 @@ static int included_patches[] = {
//613,
//612,
//611,
- //610,
+ //610 NA
//609,
//608,
//607,
@@ -184,7 +184,7 @@ static int included_patches[] = {
//602,
601,
//600,
- //599,
+ 599,
//598,
//597,
//596,