mirror of
https://github.com/neovim/neovim.git
synced 2025-02-25 18:55:25 -06:00
vim-patch:7.4.348
Problem: When using "J1" in 'cinoptions' a line below a continuation line gets too much indent. Solution: Fix parenthesis in condition. https://code.google.com/p/vim/source/detail?r=v7-4-348
This commit is contained in:
parent
053a13d2a4
commit
f4f9e7eaf3
@ -2009,12 +2009,14 @@ int get_c_indent(void)
|
|||||||
* ldfd) {
|
* ldfd) {
|
||||||
* }
|
* }
|
||||||
*/
|
*/
|
||||||
if (curbuf->b_ind_js || (curbuf->b_ind_keep_case_label
|
if ((curbuf->b_ind_js || curbuf->b_ind_keep_case_label)
|
||||||
&& cin_iscase(skipwhite(get_cursor_line_ptr()),
|
&& cin_iscase(skipwhite(get_cursor_line_ptr()), FALSE)) {
|
||||||
FALSE)))
|
|
||||||
amount = get_indent();
|
amount = get_indent();
|
||||||
else
|
} else if (curbuf->b_ind_js) {
|
||||||
|
amount = get_indent_lnum(lnum);
|
||||||
|
} else {
|
||||||
amount = skip_label(lnum, &l);
|
amount = skip_label(lnum, &l);
|
||||||
|
}
|
||||||
|
|
||||||
start_brace = BRACE_AT_END;
|
start_brace = BRACE_AT_END;
|
||||||
}
|
}
|
||||||
|
@ -247,7 +247,7 @@ static int included_patches[] = {
|
|||||||
//351,
|
//351,
|
||||||
//350,
|
//350,
|
||||||
//349,
|
//349,
|
||||||
//348,
|
348,
|
||||||
//347,
|
//347,
|
||||||
346,
|
346,
|
||||||
345,
|
345,
|
||||||
|
Loading…
Reference in New Issue
Block a user