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

patch 8.2.4704: using "else" after return or break increases indent

Browse Source 
Problem:    Using "else" after return or break increases indent.
Solution:   Remove "else" and reduce indent. (Goc Dundar, closes #10099)
This commit is contained in:
=?UTF-8?q?Dundar=20G=C3=B6c?=
2022-04-07 13:26:34 +01:00
committed by Bram Moolenaar
parent cb49a1d934
commit f26c16144d
5 changed files with 167 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/fileio.c
View File

@@ -1245,8 +1245,7 @@ retry:
read_buf_col += n; read_buf_col += n;
break; break;
} }
else
{
// Append whole line and new-line. Change NL // Append whole line and new-line. Change NL
// to NUL to reverse the effect done below. // to NUL to reverse the effect done below.
for (ni = 0; ni < n; ++ni) for (ni = 0; ni < n; ++ni)
@@ -1268,7 +1267,7 @@ retry:
eof = TRUE; eof = TRUE;
break; break;
} }
}
} }
} }
} }

5
src/memline.c
View File

@@ -3165,8 +3165,7 @@ ml_append_int(
*/ */
break; break;
} }
else // pointer block full // pointer block full
{
/* /*
* split the pointer block * split the pointer block
* allocate a new pointer block * allocate a new pointer block
@@ -3252,7 +3251,7 @@ ml_append_int(
page_count_right = 1; page_count_right = 1;
mf_put(mfp, hp, TRUE, FALSE); mf_put(mfp, hp, TRUE, FALSE);
mf_put(mfp, hp_new, TRUE, FALSE); mf_put(mfp, hp_new, TRUE, FALSE);
}
} }
/* /*

8
src/option.c
View File

@@ -4384,8 +4384,7 @@ set_option_value(
#endif #endif
if (flags & P_STRING) if (flags & P_STRING)
return set_string_option(opt_idx, string, opt_flags); return set_string_option(opt_idx, string, opt_flags);
else
{
varp = get_varp_scope(&(options[opt_idx]), opt_flags); varp = get_varp_scope(&(options[opt_idx]), opt_flags);
if (varp != NULL) // hidden option is not changed if (varp != NULL) // hidden option is not changed
{ {
@@ -4412,10 +4411,9 @@ set_option_value(
return set_num_option(opt_idx, varp, number, return set_num_option(opt_idx, varp, number,
NULL, 0, opt_flags); NULL, 0, opt_flags);
else else
return set_bool_option(opt_idx, varp, (int)number, return set_bool_option(opt_idx, varp, (int)number, opt_flags);
opt_flags);
}
} }
} }
return NULL; return NULL;
} }

4
src/syntax.c
View File

@@ -2504,8 +2504,7 @@ check_state_ends(void)
next_match_col = MAXCOL; next_match_col = MAXCOL;
break; break;
} }
else
{
// handle next_list, unless at end of line and no "skipnl" or // handle next_list, unless at end of line and no "skipnl" or
// "skipempty" // "skipempty"
current_next_list = cur_si->si_next_list; current_next_list = cur_si->si_next_list;
@@ -2554,7 +2553,6 @@ check_state_ends(void)
break; break;
} }
} }
}
else else
break; break;
} }

2
src/version.c
View File

@@ -746,6 +746,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 */
/**/
4704,
/**/ /**/
4703, 4703,
/**/ /**/