Mercurial > vim

comparison src/memline.c @ 16162:cd5c83115ec6 v8.1.1086

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.1086: too many curly braces commit https://github.com/vim/vim/commit/abab0b0fdd6535969447b03a4fffc1947918cf6c Author: Bram Moolenaar <Bram@vim.org> Date: Sat Mar 30 18:47:01 2019 +0100 patch 8.1.1086: too many curly braces Problem: Too many curly braces. Solution: Remove curly braces where they are not needed. (Hirohito Higashi, closes #3982)
author Bram Moolenaar <Bram@vim.org>
date Sat, 30 Mar 2019 19:00:07 +0100
parents 7fad90423bd2
children 7ae2396cef62
comparison
equal deleted inserted replaced
16161:75fa84e2461b 16162:cd5c83115ec6
1357 if (curbuf->b_ffname != NULL 1357 if (curbuf->b_ffname != NULL
1358 && mch_stat((char *)curbuf->b_ffname, &org_stat) != -1 1358 && mch_stat((char *)curbuf->b_ffname, &org_stat) != -1
1359 && ((mch_stat((char *)mfp->mf_fname, &swp_stat) != -1 1359 && ((mch_stat((char *)mfp->mf_fname, &swp_stat) != -1
1360 && org_stat.st_mtime > swp_stat.st_mtime) 1360 && org_stat.st_mtime > swp_stat.st_mtime)
1361 || org_stat.st_mtime != mtime)) 1361 || org_stat.st_mtime != mtime))
1362 {
1363 emsg(_("E308: Warning: Original file may have been changed")); 1362 emsg(_("E308: Warning: Original file may have been changed"));
1364 }
1365 out_flush(); 1363 out_flush();
1366 1364
1367 /* Get the 'fileformat' and 'fileencoding' from block zero. */ 1365 /* Get the 'fileformat' and 'fileencoding' from block zero. */
1368 b0_ff = (b0p->b0_flags & B0_FF_MASK); 1366 b0_ff = (b0p->b0_flags & B0_FF_MASK);
1369 if (b0p->b0_flags & B0_HAS_FENC) 1367 if (b0p->b0_flags & B0_HAS_FENC)
5305 { 5303 {
5306 for (curline = 1, curix = 0; 5304 for (curline = 1, curix = 0;
5307 curix < buf->b_ml.ml_usedchunks - 1 5305 curix < buf->b_ml.ml_usedchunks - 1
5308 && line >= curline + buf->b_ml.ml_chunksize[curix].mlcs_numlines; 5306 && line >= curline + buf->b_ml.ml_chunksize[curix].mlcs_numlines;
5309 curix++) 5307 curix++)
5310 {
5311 curline += buf->b_ml.ml_chunksize[curix].mlcs_numlines; 5308 curline += buf->b_ml.ml_chunksize[curix].mlcs_numlines;
5312 }
5313 } 5309 }
5314 else if (curix < buf->b_ml.ml_usedchunks - 1 5310 else if (curix < buf->b_ml.ml_usedchunks - 1
5315 && line >= curline + buf->b_ml.ml_chunksize[curix].mlcs_numlines) 5311 && line >= curline + buf->b_ml.ml_chunksize[curix].mlcs_numlines)
5316 { 5312 {
5317 /* Adjust cached curix & curline */ 5313 /* Adjust cached curix & curline */