diff options
| author | Bram Moolenaar <Bram@vim.org> | 2010-03-02 12:38:22 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2010-03-02 12:38:22 +0100 |
| commit | 1a89bbe8497a4bef4b97219f6ca1264f3c09e5ba (patch) | |
| tree | f4e18b65f8e471c9c1ba45526153bcacf2b7c706 | |
| parent | 86ce1cc086449a39c48e1672b0f6053f07301429 (diff) | |
updated for version 7.2.378v7.2.378
Problem: C function declaration indented too much. (Rui)
Solution: Don't see a line containing { or } as a type. (Matt Wozniski)
| -rw-r--r-- | src/misc1.c | 7 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/misc1.c b/src/misc1.c index 6b6f339912..f67f9c6a59 100644 --- a/src/misc1.c +++ b/src/misc1.c @@ -7727,11 +7727,14 @@ term_again: /* * If the NEXT line is a function declaration, the current * line needs to be indented as a function type spec. - * Don't do this if the current line looks like a comment - * or if the current line is terminated, ie. ends in ';'. + * Don't do this if the current line looks like a comment or if the + * current line is terminated, ie. ends in ';', or if the current line + * contains { or }: "void f() {\n if (1)" */ else if (cur_curpos.lnum < curbuf->b_ml.ml_line_count && !cin_nocode(theline) + && vim_strchr(theline, '{') == NULL + && vim_strchr(theline, '}') == NULL && !cin_ends_in(theline, (char_u *)":", NULL) && !cin_ends_in(theline, (char_u *)",", NULL) && cin_isfuncdecl(NULL, cur_curpos.lnum + 1) diff --git a/src/version.c b/src/version.c index 90096ac18c..4837d202bc 100644 --- a/src/version.c +++ b/src/version.c @@ -682,6 +682,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 378, +/**/ 377, /**/ 376, |