From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 27 Nov 2014 17:57:11 +0000 (+0100)
Subject: updated for version 7.4.536
X-Git-Tag: v7.4.536
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f1e30ccb822c56693881da199c7efbe6c9c0dca1;p=vim

updated for version 7.4.536
Problem:    Test 63 fails when using a black&white terminal.
Solution:   Add attributes for a non-color terminal. (Christian Brabandt)
---

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
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    536,
 /**/
     535,
 /**/