diff options
| author | dundargoc <33953936+dundargoc@users.noreply.github.com> | 2021-11-01 01:03:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-31 17:03:08 -0700 |
| commit | a68faed02dc8e37b8f10da14dc02e33e6ed93947 (patch) | |
| tree | 992c62bd3451d829d4b91fef527d3f4254254bcc /src/nvim/diff.c | |
| parent | 5ad15c9fa1ac6e6b2acfc2fe5e20148adeb85eb3 (diff) | |
| download | rneovim-a68faed02dc8e37b8f10da14dc02e33e6ed93947.tar.gz rneovim-a68faed02dc8e37b8f10da14dc02e33e6ed93947.tar.bz2 rneovim-a68faed02dc8e37b8f10da14dc02e33e6ed93947.zip | |
refactor: saner options for uncrustify #16196
* refactor: general good option changes
sp_deref = remove
sp_not = remove
sp_inv = remove
sp_inside_paren_cast = remove
mod_remove_duplicate_include = true
sp_after_semi = add
sp_after_semi_for = force
sp_sizeof_paren = remove
nl_return_expr = remove
nl_else_brace = remove
nl_else_if = remove
* refactor: mod_remove_extra_semicolon = true
* refactor: nl_max = 3
* refactor: sp_bool = force
* refactor: sp_compare = force
* refactor: sp_inside_paren = remove
* refactor: sp_paren_paren = remove
* refactor: sp_inside_sparen = remove
* refactor: sp_before_sparen = force
* refactor: sp_sign = remove
* refactor: sp_addr = remove
* refactor: sp_member = remove
* refactor: nl_struct_brace = remove
* refactor: nl_before_if_closing_paren = remove
* refactor: nl_fdef_brace = force
* refactor: sp_paren_comma = force
* refactor: mod_full_brace_do = add
Diffstat (limited to 'src/nvim/diff.c')
| -rw-r--r-- | src/nvim/diff.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/diff.c b/src/nvim/diff.c index 7c33f0cab6..6e54c0bf0e 100644 --- a/src/nvim/diff.c +++ b/src/nvim/diff.c @@ -1600,7 +1600,7 @@ static void diff_read(int idx_orig, int idx_new, diffout_T *dout) } } else { assert(diffstyle == DIFF_UNIFIED); - if (STRNCMP(line, "@@ ", 3) != 0) { + if (STRNCMP(line, "@@ ", 3) != 0) { continue; // not the start of a diff block } if (parse_diff_unified(line, &lnum_orig, &count_orig, @@ -3147,7 +3147,7 @@ static int xdiff_out(void *priv, mmbuffer_t *mb, int nbuf) } // sanity check - if (STRNCMP(mb[0].ptr, "@@ ", 3) != 0) { + if (STRNCMP(mb[0].ptr, "@@ ", 3) != 0) { return 0; } |