]> granicus.if.org Git - vim/commitdiff
updated for version 7.2.340 v7.2.340
authorBram Moolenaar <Bram@vim.org>
Tue, 19 Jan 2010 16:24:25 +0000 (17:24 +0100)
committerBram Moolenaar <Bram@vim.org>
Tue, 19 Jan 2010 16:24:25 +0000 (17:24 +0100)
Problem:    Gcc warning for condition that can never be true. (James Vega)
Solution:   Use start_lvl instead flp->lvl.

src/fold.c
src/version.c

index 2898c01df08178b5a1bfffc1c0e437ddbbab2364..405a6ef1d602ee15c0f66a3733ebe484fe75312f 100644 (file)
@@ -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
index 5c7c50a5d324e05dc5cbe87df9ab70a14e06b96e..355549baafbec5aab92ca942a820e08dab2b6c97 100644 (file)
@@ -681,6 +681,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    340,
 /**/
     339,
 /**/