diff options
| author | Florian Walch <florian@fwalch.com> | 2014-12-24 14:29:03 +0100 |
|---|---|---|
| committer | Florian Walch <florian@fwalch.com> | 2014-12-24 23:29:00 +0100 |
| commit | 476a2c0a83304c069b90e0110a5c67c8953aab18 (patch) | |
| tree | 18c092479d0b7d330c4c852a4344eb1af8aa2c89 /src | |
| parent | 0439e808cb0ca999218f8a466e4a9a57113f4e0c (diff) | |
| download | rneovim-476a2c0a83304c069b90e0110a5c67c8953aab18.tar.gz rneovim-476a2c0a83304c069b90e0110a5c67c8953aab18.tar.bz2 rneovim-476a2c0a83304c069b90e0110a5c67c8953aab18.zip | |
vim-patch:7.4.536
Problem: Test 63 fails when using a black&white terminal.
Solution: Add attributes for a non-color terminal. (Christian Brabandt)
https://code.google.com/p/vim/source/detail?r=v7-4-536
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/testdir/test63.in | 6 | ||||
| -rw-r--r-- | 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 db347a0a87..7fbe0ac434 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 guibg=red -:highlight MyGroup2 ctermbg=green guibg=green -:highlight MyGroup3 ctermbg=blue guibg=blue +:highlight MyGroup1 term=bold ctermbg=red guibg=red +:highlight MyGroup2 term=italic ctermbg=green guibg=green +:highlight MyGroup3 term=underline 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 dc7c62305a..b7b50e9e9c 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -202,7 +202,7 @@ static int included_patches[] = { //539, //538, //537, - //536, + 536, //535, //534 NA //533, |