diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2014-10-06 21:15:49 -0400 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2014-10-06 21:15:49 -0400 |
| commit | 04b298ee754bad9917cd910b59299c5be2cd59e0 (patch) | |
| tree | c50d2fc4561d260fc339ab11d540557a51ba821d | |
| parent | 66ec1a448e4f1602ab9b552ad590a8fadb3b98ae (diff) | |
| parent | e397c57d03b7337813adc709d1f57b05c23becab (diff) | |
| download | rneovim-04b298ee754bad9917cd910b59299c5be2cd59e0.tar.gz rneovim-04b298ee754bad9917cd910b59299c5be2cd59e0.tar.bz2 rneovim-04b298ee754bad9917cd910b59299c5be2cd59e0.zip | |
Merge pull request #1254 from splinterofchaos/na-patches
Mark patches 363 and 366 NA; vim-patch:7.4.375
| -rw-r--r-- | src/nvim/testdir/test63.in | 6 | ||||
| -rw-r--r-- | src/nvim/version.c | 6 |
2 files changed, 6 insertions, 6 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 47f4a2f805..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, @@ -275,10 +275,10 @@ static int included_patches[] = { 369, 368, 367, - //366, + //366 NA 365, 364, - //363, + //363 NA 362, 361, 360, |