summaryrefslogtreecommitdiff
path: root/src/fold.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2010-06-22 06:28:58 +0200
committerBram Moolenaar <Bram@vim.org>2010-06-22 06:28:58 +0200
commitf506c5bb1c0c191511316b4b9b2e9a5af176d446 (patch)
treeb01e3afaefbe7db1a7ce9052d68396225053a190 /src/fold.c
parent7cfea75ed6897c81dc129490dd894b1ddeebf433 (diff)
downloadvim-git-f506c5bb1c0c191511316b4b9b2e9a5af176d446.tar.gz
Fix compiler warnings for shadowed variables. Make 'conceal' a long instead
of int.
Diffstat (limited to 'src/fold.c')
-rw-r--r--src/fold.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/fold.c b/src/fold.c
index c88e8f793..800db61ba 100644
--- a/src/fold.c
+++ b/src/fold.c
@@ -2265,24 +2265,24 @@ foldUpdateIEMS(wp, top, bot)
if (foldlevelSyntax == getlevel)
{
garray_T *gap = &wp->w_folds;
- fold_T *fp = NULL;
+ fold_T *fpn = NULL;
int current_fdl = 0;
linenr_T fold_start_lnum = 0;
linenr_T lnum_rel = fline.lnum;
while (current_fdl < fline.lvl)
{
- if (!foldFind(gap, lnum_rel, &fp))
+ if (!foldFind(gap, lnum_rel, &fpn))
break;
++current_fdl;
- fold_start_lnum += fp->fd_top;
- gap = &fp->fd_nested;
- lnum_rel -= fp->fd_top;
+ fold_start_lnum += fpn->fd_top;
+ gap = &fpn->fd_nested;
+ lnum_rel -= fpn->fd_top;
}
- if (fp != NULL && current_fdl == fline.lvl)
+ if (fpn != NULL && current_fdl == fline.lvl)
{
- linenr_T fold_end_lnum = fold_start_lnum + fp->fd_len;
+ linenr_T fold_end_lnum = fold_start_lnum + fpn->fd_len;
if (fold_end_lnum > bot)
bot = fold_end_lnum;