From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 2 Mar 2010 11:38:22 +0000 (+0100)
Subject: updated for version 7.2.378
X-Git-Tag: v7.2.378
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1a89bbe8497a4bef4b97219f6ca1264f3c09e5ba;p=vim

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 6b6f33991..f67f9c6a5 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 90096ac18..4837d202b 100644
--- 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,
 /**/