summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-07-17 22:33:53 +0200
committerBram Moolenaar <Bram@vim.org>2016-07-17 22:33:53 +0200
commit69aa099641616268bfcde9dc3aa313c677846b12 (patch)
tree7c2b1cfab0dac20716f11985f11cafe3d8d2782c
parent4f5c5f29806e53251b7a7b68ce7de86a21ff8015 (diff)
downloadvim-git-69aa099641616268bfcde9dc3aa313c677846b12.tar.gz
patch 7.4.2065v7.4.2065
Problem: Compiler warns for uninitialzed variable. (John Marriott) Solution: Set lnum to the right value.
-rw-r--r--src/evalfunc.c5
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 4 deletions
diff --git a/src/evalfunc.c b/src/evalfunc.c
index 7d3f87521..07c757517 100644
--- 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 e1fcacac2..8ebd30955 100644
--- a/src/version.c
+++ b/src/version.c
@@ -759,6 +759,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2065,
+/**/
2064,
/**/
2063,