Mercurial > vim
changeset 12327:17ed65e87db1 v8.0.1043
patch 8.0.1043: warning for uninitialized variable
commit https://github.com/vim/vim/commit/4ec86ddd77a89766e42bd0a6cfcf10af4c3d03b2
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Sep 2 23:28:54 2017 +0200
patch 8.0.1043: warning for uninitialized variable
Problem: Warning for uninitialized variable. (John Marriott)
Solution: Move code to check indent inside "if".
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sat, 02 Sep 2017 23:30:04 +0200 |
| parents | fb7fc05de526 |
| children | 36aad5463871 |
| files | src/ops.c src/version.c |
| diffstat | 2 files changed, 11 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ops.c +++ b/src/ops.c @@ -2597,14 +2597,6 @@ op_insert(oparg_T *oap, long count1) && LT_POS(curbuf->b_op_start_orig, t1)) oap->start = curbuf->b_op_start_orig; - /* if indent kicked in, the firstline might have changed - * but only do that, if the indent actually increased */ - ind_post = (colnr_T)getwhitecols_curline(); - if (curbuf->b_op_start.col > ind_pre && ind_post > ind_pre) - { - bd.textcol += ind_post - ind_pre; - bd.start_vcol += ind_post - ind_pre; - } /* If user has moved off this line, we don't know what to do, so do * nothing. * Also don't repeat the insert when Insert mode ended with CTRL-C. */ @@ -2615,6 +2607,15 @@ op_insert(oparg_T *oap, long count1) { struct block_def bd2; + /* If indent kicked in, the firstline might have changed + * but only do that, if the indent actually increased. */ + ind_post = (colnr_T)getwhitecols_curline(); + if (curbuf->b_op_start.col > ind_pre && ind_post > ind_pre) + { + bd.textcol += ind_post - ind_pre; + bd.start_vcol += ind_post - ind_pre; + } + /* The user may have moved the cursor before inserting something, try * to adjust the block for that. */ if (oap->start.lnum == curbuf->b_op_start_orig.lnum && !bd.is_MAX)