From 4ec86ddd77a89766e42bd0a6cfcf10af4c3d03b2 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sat, 2 Sep 2017 23:28:54 +0200 Subject: [PATCH] patch 8.0.1043: warning for uninitialized variable Problem: Warning for uninitialized variable. (John Marriott) Solution: Move code to check indent inside "if". --- src/ops.c | 17 +++++++++-------- src/version.c | 2 ++ 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/ops.c b/src/ops.c index 9ca5198d2..e8308bbcb 100644 --- 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) diff --git a/src/version.c b/src/version.c index 77620adc3..2138f0ae9 100644 --- a/src/version.c +++ b/src/version.c @@ -769,6 +769,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1043, /**/ 1042, /**/ -- 2.40.0