summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2010-01-19 17:24:25 +0100
committerBram Moolenaar <Bram@vim.org>2010-01-19 17:24:25 +0100
commit3ee0229f640c13a929d4021201d950208495bcf3 (patch)
tree4ce546f9dc317d116a32ebf1469b589970165de5
parentc4e4198730dabb34313a6a0325d68e18551f113e (diff)
downloadvim-git-3ee0229f640c13a929d4021201d950208495bcf3.tar.gz
updated for version 7.2.340v7.2.340
Problem: Gcc warning for condition that can never be true. (James Vega) Solution: Use start_lvl instead flp->lvl.
-rw-r--r--src/fold.c4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/fold.c b/src/fold.c
index 2898c01df..405a6ef1d 100644
--- a/src/fold.c
+++ b/src/fold.c
@@ -3239,8 +3239,8 @@ foldlevelMarker(flp)
flp->lvl = n;
flp->lvl_next = n - 1;
/* never start a fold with an end marker */
- if (flp->lvl_next > flp->lvl)
- flp->lvl_next = flp->lvl;
+ if (flp->lvl_next > start_lvl)
+ flp->lvl_next = start_lvl;
}
}
else
diff --git a/src/version.c b/src/version.c
index 5c7c50a5d..355549baa 100644
--- a/src/version.c
+++ b/src/version.c
@@ -682,6 +682,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 340,
+/**/
339,
/**/
338,