diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2020-03-01 23:23:50 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-01 23:23:50 -0800 |
| commit | 0110735547bc5a491eff195096ba93e3ddefb19f (patch) | |
| tree | aad45b055941ef137d86494b534a7b53e5ac38ec /src/nvim/indent_c.c | |
| parent | 5e0c435ca1b711e80f78429431b4d400d789c618 (diff) | |
| parent | f1923d4b92239ef2ca280bf1ce6c5f6cc7cb4f1a (diff) | |
| download | rneovim-0110735547bc5a491eff195096ba93e3ddefb19f.tar.gz rneovim-0110735547bc5a491eff195096ba93e3ddefb19f.tar.bz2 rneovim-0110735547bc5a491eff195096ba93e3ddefb19f.zip | |
Merge #11929 from janlazo/vim-8.1.1510
vim-patch:8.0.1587,8.1.{253,881,883,885,896,939,1107,1108,1466,1489,1510,1552,1642,1793},8.2.{108,133,135}
Diffstat (limited to 'src/nvim/indent_c.c')
| -rw-r--r-- | src/nvim/indent_c.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/nvim/indent_c.c b/src/nvim/indent_c.c index 67a7e58ed7..bb443161ef 100644 --- a/src/nvim/indent_c.c +++ b/src/nvim/indent_c.c @@ -3372,11 +3372,9 @@ term_again: continue; } - /* - * Are we at the start of a cpp base class declaration or - * constructor initialization? - */ /* XXX */ - n = false; + // Are we at the start of a cpp base class declaration or + // constructor initialization? XXX + n = 0; if (curbuf->b_ind_cpp_baseclass != 0 && theline[0] != '{') { n = cin_is_cpp_baseclass(&cache_cpp_baseclass); l = get_cursor_line_ptr(); @@ -3409,7 +3407,6 @@ term_again: * } foo, * bar; */ - n = 0; if (cin_ends_in(l, (char_u *)",", NULL) || (*l != NUL && (n = l[STRLEN(l) - 1]) == '\\')) { /* take us back to opening paren */ |