summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2015-11-10 15:18:02 +0100
committerBram Moolenaar <Bram@vim.org>2015-11-10 15:18:02 +0100
commit98b30a473a58ae98c280e0383c8b1e08c0ebced5 (patch)
treee36f8859704820996b1444f119a6c22495397663
parent72f4cc4a987d123c0ed909c85b9a05f65cef7202 (diff)
patch 7.4.914v7.4.914
Problem: New compiler warning: logical-not-parentheses Solution: Silence the warning.
-rw-r--r--src/term.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/term.c b/src/term.c
index d35a57e046..51698fb993 100644
--- a/src/term.c
+++ b/src/term.c
@@ -2276,7 +2276,7 @@ add_termcap_entry(name, force)
*/
for (i = 0; i < 2; ++i)
{
- if (!builtin_first == i)
+ if ((!builtin_first) == i)
#endif
/*
* Search in builtin termcap
diff --git a/src/version.c b/src/version.c
index 1604635aeb..450892a5c5 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 */
/**/
+ 914,
+/**/
913,
/**/
912,