patch 7.4.2065

Problem:    Compiler warns for uninitialzed variable. (John Marriott)
Solution:   Set lnum to the right value.

diff --git a/src/evalfunc.c b/src/evalfunc.c
index 7d3f875210370e94c42ee6aaef38ccbf01961368..07c7575173d79640fb62332f0aef8d043beefc4d 100644 (file)
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -3447,12 +3447,9 @@ f_foldtext(typval_T *argvars UNUSED, typval_T *rettv)
            && dashes != NULL)
     {
        /* Find first non-empty line in the fold. */
-       while (lnum < (linenr_T)get_vim_var_nr(VV_FOLDEND))
-       {
+       for (lnum = foldstart; lnum < foldend; ++lnum)
            if (!linewhite(lnum))
                break;
-           ++lnum;
-       }
 
        /* Find interesting text in this line. */
        s = skipwhite(ml_get(lnum));

diff --git a/src/version.c b/src/version.c
index e1fcacac238c8f3cce49384db7f347ed9d797e94..8ebd309556b3b23a6d76548a3bfc0c32429e66e8 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2065,
 /**/
     2064,
 /**/