Mercurial > vim

diff src/memline.c @ 2271:2b33a7678e7b vim73

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix compiler warnings for shadowed variables. Make 'conceal' a long instead of int.
author Bram Moolenaar <bram@vim.org>
date Tue, 22 Jun 2010 06:28:58 +0200
parents c08f91142c41
children 69dc5f32f5d2
line wrap: on
line diff
--- a/src/memline.c
+++ b/src/memline.c
@@ -1335,16 +1335,16 @@ ml_recover()
     b0_ff = (b0p->b0_flags & B0_FF_MASK);
     if (b0p->b0_flags & B0_HAS_FENC)
     {
-	int size = B0_FNAME_SIZE_NOCRYPT;
+	int fnsize = B0_FNAME_SIZE_NOCRYPT;
 
 #ifdef FEAT_CRYPT
 	/* Use the same size as in add_b0_fenc(). */
 	if (b0p->b0_id[1] != BLOCK0_ID1)
-	    size = B0_FNAME_SIZE_CRYPT;
+	    fnsize = B0_FNAME_SIZE_CRYPT;
 #endif
-	for (p = b0p->b0_fname + size; p > b0p->b0_fname && p[-1] != NUL; --p)
+	for (p = b0p->b0_fname + fnsize; p > b0p->b0_fname && p[-1] != NUL; --p)
 	    ;
-	b0_fenc = vim_strnsave(p, (int)(b0p->b0_fname + size - p));
+	b0_fenc = vim_strnsave(p, (int)(b0p->b0_fname + fnsize - p));
     }
 
     mf_put(mfp, hp, FALSE, FALSE);	/* release block 0 */