diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2014-09-11 14:32:17 -0400 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2014-09-11 14:32:17 -0400 |
| commit | ba4acce341d7c289ca84a7e5422c4a4d5fca2ed2 (patch) | |
| tree | 043551d900e68ef1dcd7968ddc8e124434779a05 /src | |
| parent | 053a13d2a4ee0188c851ed58539c0fa5cb2c71b8 (diff) | |
| parent | f4f9e7eaf34d9a91c4a280aa01f865a5e30634e5 (diff) | |
| download | rneovim-ba4acce341d7c289ca84a7e5422c4a4d5fca2ed2.tar.gz rneovim-ba4acce341d7c289ca84a7e5422c4a4d5fca2ed2.tar.bz2 rneovim-ba4acce341d7c289ca84a7e5422c4a4d5fca2ed2.zip | |
Merge pull request #1160 from atwupack/vp-7.4.348
vim-patch:7.4.348
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/indent_c.c | 10 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/nvim/indent_c.c b/src/nvim/indent_c.c index 6e12194b63..509f94dbf2 100644 --- a/src/nvim/indent_c.c +++ b/src/nvim/indent_c.c @@ -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; } diff --git a/src/nvim/version.c b/src/nvim/version.c index 7143be48c7..dccd47846e 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -247,7 +247,7 @@ static int included_patches[] = { //351, //350, //349, - //348, + 348, //347, 346, 345, |