summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2014-11-27 18:57:11 +0100
committerBram Moolenaar <Bram@vim.org>2014-11-27 18:57:11 +0100
commitf1e30ccb822c56693881da199c7efbe6c9c0dca1 (patch)
treeea441339288cee75ab8b906b7e70b977f5a4720b
parentf240e181d720c8a056ad57dfa160b0e8c1371c3a (diff)
downloadvim-git-f1e30ccb822c56693881da199c7efbe6c9c0dca1.tar.gz
updated for version 7.4.536v7.4.536
Problem: Test 63 fails when using a black&white terminal. Solution: Add attributes for a non-color terminal. (Christian Brabandt)
-rw-r--r--src/testdir/test63.in6
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 3 deletions
diff --git a/src/testdir/test63.in b/src/testdir/test63.in
index a161d6745..1f073a78a 100644
--- a/src/testdir/test63.in
+++ b/src/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/version.c b/src/version.c
index 6ce2f04fb..5915f95eb 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 536,
+/**/
535,
/**/
534,