From 0f604e1da21c035db34f5f194a867829d58c55cc Mon Sep 17 00:00:00 2001
From: watiko <service@mail.watiko.net>
Date: Sun, 28 Feb 2016 04:52:55 +0900
Subject: version.c: Mark vim-patches NA

NA patch list:
  892: (MS-Win, iconv)
       https://github.com/vim/vim/commit/9d6ca1cc5ebb6e61cc2ef73aecfbb0bdbb65432f

  904: ({,g}vim.desktop)
       https://github.com/vim/vim/commit/6407b3e80d7d7f8f0797c13ae35cc06f96be46c9
       https://github.com/vim/vim/commit/1d8d9c0bec84ac799a2f62a5ac81eade3eaf638a
       vim-patch:1d8d9c0bec84ac799a2f62a5ac81eade3eaf638a

  905: (if_py_both)
       https://github.com/vim/vim/commit/d424747d5821c2873e24d25d3407d08b25ea3443

  909: (src/Makefile)
       https://github.com/vim/vim/commit/de59ba33aa3b94f2757dbf3451682d762c15ebcf

  914: (src/term.c, logical-not-parentheses)
       https://github.com/vim/vim/commit/98b30a473a58ae98c280e0383c8b1e08c0ebced5

  943: (src/testdir/Makefile, test_writefile)
       https://github.com/vim/vim/commit/48a969b48898fb08dce636c6b918408c6fbd3ea0

  947: (src/testdir/Make_ming.mak, Test_listchars)
       https://github.com/vim/vim/commit/5311c02f25eed8f34e8a80becb98e86264f371c3

  956: (empty) Missing parts are in other runtime comitts.
       https://github.com/vim/vim/commit/f882d9f89dbe24ab1ba4bc88529bef28242fd2ed

  969: (cast) HAVE_AVAIL_MEM was removed.
       https://github.com/vim/vim/commit/35be4534c029148a89ccc41e8e465d793e7ed7c2

  993: (if_py_both)
       https://github.com/vim/vim/commit/52f6ae1366b34fc5771595c0bd17c779a7f6f544

Already merged patch list:
  vim-patch:35e7594dd429f7a8a06cefd61c3e8d48b9bd74e2
  vim-patch:44132a10aeb45c957959cafb4ac39d3f478be98c
  vim-patch:974
---
 src/nvim/version.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'src')

diff --git a/src/nvim/version.c b/src/nvim/version.c
index 80b1b236dd..678ba302fc 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -297,7 +297,7 @@ static int included_patches[] = {
   // 996 NA
   // 995 NA
   // 994 NA
-  // 993,
+  // 993 NA
   // 992 NA
   991,
   // 990 NA
@@ -316,12 +316,12 @@ static int included_patches[] = {
   977,
   // 976 NA
   975,
-  // 974,
+  974,
   // 973,
   972,
   // 971 NA
   // 970 NA
-  // 969,
+  // 969 NA
   // 968 NA
   // 967 NA
   // 966 NA
@@ -334,7 +334,7 @@ static int included_patches[] = {
   // 959 NA
   // 958,
   // 957,
-  // 956,
+  // 956 NA
   955,
   // 954 NA
   953,
@@ -343,11 +343,11 @@ static int included_patches[] = {
   950,
   949,
   // 948 NA
-  // 947,
+  // 947 NA
   946,
   945,
   944,
-  // 943,
+  // 943 NA
   // 942,
   // 941,
   // 940 NA
@@ -376,17 +376,17 @@ static int included_patches[] = {
   // 917 NA
   916,
   915,
-  // 914,
+  // 914 NA
   // 913 NA
   912,
   // 911 NA
   // 910 NA
-  // 909,
+  // 909 NA
   // 908 NA
   // 907 NA
   // 906 NA
-  // 905,
-  // 904,
+  // 905 NA
+  // 904 NA
   903,
   // 902 NA
   901,
@@ -398,7 +398,7 @@ static int included_patches[] = {
   895,
   // 894 NA
   893,
-  // 892,
+  // 892 NA
   891,
   // 890 NA
   // 889,
-- 
cgit