thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.0.1043: warning for uninitialized variable

Browse Source 
Problem:    Warning for uninitialized variable. (John Marriott)
Solution:   Move code to check indent inside "if".
This commit is contained in:
Bram Moolenaar
2017-09-02 23:28:54 +02:00
parent 9f45ccd1bf
commit 4ec86ddd77
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/ops.c
View File

@@ -2597,14 +2597,6 @@ op_insert(oparg_T *oap, long count1)
&& LT_POS(curbuf->b_op_start_orig, t1)) && LT_POS(curbuf->b_op_start_orig, t1))
oap->start = curbuf->b_op_start_orig; 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 /* If user has moved off this line, we don't know what to do, so do
* nothing. * nothing.
* Also don't repeat the insert when Insert mode ended with CTRL-C. */ * 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; 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 /* The user may have moved the cursor before inserting something, try
* to adjust the block for that. */ * to adjust the block for that. */
if (oap->start.lnum == curbuf->b_op_start_orig.lnum && !bd.is_MAX) if (oap->start.lnum == curbuf->b_op_start_orig.lnum && !bd.is_MAX)

2
src/version.c
View File

@@ -769,6 +769,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1043,
/**/ /**/
1042, 1042,
/**/ /**/