updated for version 7.2.378

Problem:    C function declaration indented too much. (Rui)
Solution:   Don't see a line containing { or } as a type. (Matt Wozniski)

diff --git a/src/misc1.c b/src/misc1.c
index 6b6f33991236a7ffcb906b83dc5f1f3a459648bb..f67f9c6a59f221c05bcc9ec3eb819c91a33cf3f6 100644 (file)
--- 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 90096ac18cc625badb16fa9a4004eb96927e2cc5..4837d202bc186b7fa35741148f2f4d516e9ea3d6 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -681,6 +681,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    378,
 /**/
     377,
 /**/