diff options
| author | Josh Rahm <joshuarahm@gmail.com> | 2022-08-03 00:08:17 -0600 |
|---|---|---|
| committer | Josh Rahm <joshuarahm@gmail.com> | 2022-08-03 00:08:17 -0600 |
| commit | 9449e1b8d273ff78eb894c588110ffa0c17d6ee3 (patch) | |
| tree | 9e4470c33bd4187d9f42f0b2c4aaa995310c5be8 /src/nvim/indent_c.c | |
| parent | 308e1940dcd64aa6c344c403d4f9e0dda58d9c5c (diff) | |
| parent | b8dcbcc732baf84fc48d6b272c3ade0bcb129b3b (diff) | |
| download | rneovim-9449e1b8d273ff78eb894c588110ffa0c17d6ee3.tar.gz rneovim-9449e1b8d273ff78eb894c588110ffa0c17d6ee3.tar.bz2 rneovim-9449e1b8d273ff78eb894c588110ffa0c17d6ee3.zip | |
Merge remote-tracking branch 'upstream/master' into rahm
Diffstat (limited to 'src/nvim/indent_c.c')
| -rw-r--r-- | src/nvim/indent_c.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/indent_c.c b/src/nvim/indent_c.c index 3c74b4bd8d..c5e030ce25 100644 --- a/src/nvim/indent_c.c +++ b/src/nvim/indent_c.c @@ -2002,7 +2002,7 @@ int get_c_indent(void) } // #defines and so on go at the left when included in 'cinkeys', - // exluding pragmas when customized in 'cinoptions' + // excluding pragmas when customized in 'cinoptions' if (*theline == '#' && (*linecopy == '#' || in_cinkeys('#', ' ', true))) { const char_u *const directive = (char_u *)skipwhite((char *)theline + 1); if (curbuf->b_ind_pragma == 0 || STRNCMP(directive, "pragma", 6) != 0) { @@ -3569,7 +3569,7 @@ term_again: // 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] != '{') { + if (curbuf->b_ind_cpp_baseclass != 0) { n = cin_is_cpp_baseclass(&cache_cpp_baseclass); l = get_cursor_line_ptr(); } |