From 5962daeb9631024cd421b7d7cacfd7c447fffaea Mon Sep 17 00:00:00 2001 From: Scott Prager Date: Sat, 27 Sep 2014 14:48:38 -0400 Subject: [PATCH 1/2] Mark patches 363 and 366 NA. --- src/nvim/version.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/nvim/version.c b/src/nvim/version.c index 47f4a2f805..87e7240ac5 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -275,10 +275,10 @@ static int included_patches[] = { 369, 368, 367, - //366, + //366 NA 365, 364, - //363, + //363 NA 362, 361, 360, From e397c57d03b7337813adc709d1f57b05c23becab Mon Sep 17 00:00:00 2001 From: Scott Prager Date: Sat, 27 Sep 2014 14:59:05 -0400 Subject: [PATCH 2/2] vim-patch:7.4.375 Problem: Test 63 fails when run with GUI-only Vim. Solution: Add guibg attributes. (suggested by Mike Soyka) https://code.google.com/p/vim/source/detail?r=v7-4-375 --- src/nvim/testdir/test63.in | 6 +++--- src/nvim/version.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/nvim/testdir/test63.in b/src/nvim/testdir/test63.in index ff05afbf81..db347a0a87 100644 --- a/src/nvim/testdir/test63.in +++ b/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/ diff --git a/src/nvim/version.c b/src/nvim/version.c index 87e7240ac5..043b720743 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -266,7 +266,7 @@ static int included_patches[] = { //378, 377, 376, - //375, + 375, 374, 373, 372,