mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2026-04-21 14:55:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1160 from atwupack/vp-7.4.348

Browse Source 
vim-patch:7.4.348
This commit is contained in:
Justin M. Keyes
2014-09-11 14:32:17 -04:00
parent 053a13d2a4 f4f9e7eaf3
commit ba4acce341
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/nvim/indent_c.c
View File

@@ -2009,12 +2009,14 @@ int get_c_indent(void)
* ldfd) {
* }
*/
if (curbuf->b_ind_js || (curbuf->b_ind_keep_case_label
&& cin_iscase(skipwhite(get_cursor_line_ptr()),
FALSE)))
if ((curbuf->b_ind_js || curbuf->b_ind_keep_case_label)
&& cin_iscase(skipwhite(get_cursor_line_ptr()), FALSE)) {
amount = get_indent();
else
} else if (curbuf->b_ind_js) {
amount = get_indent_lnum(lnum);
} else {
amount = skip_label(lnum, &l);
}
start_brace = BRACE_AT_END;
}

2
src/nvim/version.c
View File

@@ -247,7 +247,7 @@ static int included_patches[] = {
//351,
//350,
//349,
//348,
348,
//347,
346,
345,