Merge pull request #1254 from splinterofchaos/na-patches

Mark patches 363 and 366 NA; vim-patch:7.4.375

src/nvim/testdir/test63.in

@@ -7,9 +7,9 @@ STARTTEST
 :" --- Check that "matcharg()" returns the correct group and pattern if a match
 :" --- is defined.
 :let @r = "*** Test 1: "
-:highlight MyGroup1 ctermbg=red
-:highlight MyGroup2 ctermbg=green
-:highlight MyGroup3 ctermbg=blue
+:highlight MyGroup1 ctermbg=red guibg=red
+:highlight MyGroup2 ctermbg=green guibg=green
+:highlight MyGroup3 ctermbg=blue guibg=blue
 :match MyGroup1 /TODO/
 :2match MyGroup2 /FIXME/
 :3match MyGroup3 /XXX/

src/nvim/version.c

@@ -266,7 +266,7 @@ static int included_patches[] = {
   //378,
   377,
   376,
-  //375,
+  375,
   374,
   373,
   372,
@@ -275,10 +275,10 @@ static int included_patches[] = {
   369,
   368,
   367,
-  //366,
+  //366 NA
   365,
   364,
-  //363,
+  //363 NA
   362,
   361,
   360,