aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Prager <splinterofchaos@gmail.com>2014-09-27 14:59:05 -0400
committerScott Prager <splinterofchaos@gmail.com>2014-10-06 19:38:17 -0400
commite397c57d03b7337813adc709d1f57b05c23becab (patch)
treec50d2fc4561d260fc339ab11d540557a51ba821d
parent5962daeb9631024cd421b7d7cacfd7c447fffaea (diff)
downloadrneovim-e397c57d03b7337813adc709d1f57b05c23becab.tar.gz
rneovim-e397c57d03b7337813adc709d1f57b05c23becab.tar.bz2
rneovim-e397c57d03b7337813adc709d1f57b05c23becab.zip
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
-rw-r--r--src/nvim/testdir/test63.in6
-rw-r--r--src/nvim/version.c2
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,