From 18f08c3b3f23531e0d627acf0e61505b0da74a8e Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 30 Nov 2011 17:20:23 +0100
Subject: updated for version 7.3.363 Problem:    C indenting is wrong after
 #endif followed by a semicolon. Solution:   Add special handling for a
 semicolon in a line by itself. (Lech 	    Lorens)

---
 src/misc1.c          | 23 +++++++++++++++++++++++
 src/testdir/test3.in | 10 ++++++++++
 src/testdir/test3.ok | 10 ++++++++++
 src/version.c        |  2 ++
 4 files changed, 45 insertions(+)

diff --git a/src/misc1.c b/src/misc1.c
index d260b0c2..11a1f94f 100644
--- a/src/misc1.c
+++ b/src/misc1.c
@@ -8142,6 +8142,29 @@ term_again:
 		if (cin_ends_in(l, (char_u *)"};", NULL))
 		    break;
 
+		/*
+		 * Find a line only has a semicolon that belongs to a previous
+		 * line ending in '}', e.g. before an #endif.  Don't increase
+		 * indent then.
+		 */
+		if (*(look = skipwhite(l)) == ';' && cin_nocode(look + 1))
+		{
+		    pos_T curpos_save = curwin->w_cursor;
+
+		    while (curwin->w_cursor.lnum > 1)
+		    {
+			look = ml_get(--curwin->w_cursor.lnum);
+			if (!(cin_nocode(look) || cin_ispreproc_cont(
+					      &look, &curwin->w_cursor.lnum)))
+			    break;
+		    }
+		    if (curwin->w_cursor.lnum > 0
+				    && cin_ends_in(look, (char_u *)"}", NULL))
+			break;
+
+		    curwin->w_cursor = curpos_save;
+		}
+
 		/*
 		 * If the PREVIOUS line is a function declaration, the current
 		 * line (and the ones that follow) needs to be indented as
diff --git a/src/testdir/test3.in b/src/testdir/test3.in
index f987478f..d3911427 100644
--- a/src/testdir/test3.in
+++ b/src/testdir/test3.in
@@ -1454,6 +1454,16 @@ void func2(void)
 		printf("This line used to be indented incorrectly.\n");
 }
 
+int foo[]
+#ifdef BAR
+
+= { 1, 2, 3,
+	4, 5, 6 }
+
+#endif
+;
+	int baz;
+
 void func3(void)
 {
 	int tab[] = {
diff --git a/src/testdir/test3.ok b/src/testdir/test3.ok
index c95b1884..3c073664 100644
--- a/src/testdir/test3.ok
+++ b/src/testdir/test3.ok
@@ -1307,6 +1307,16 @@ void func2(void)
 	printf("This line used to be indented incorrectly.\n");
 }
 
+int foo[]
+#ifdef BAR
+
+= { 1, 2, 3,
+	4, 5, 6 }
+
+#endif
+	;
+int baz;
+
 void func3(void)
 {
 	int tab[] = {
diff --git a/src/version.c b/src/version.c
index 99d6a79a..4719ffc5 100644
--- a/src/version.c
+++ b/src/version.c
@@ -714,6 +714,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    363,
 /**/
     362,
 /**/
-- 
cgit v1.2.1