From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 14 Dec 2011 19:05:21 +0000 (+0100)
Subject: updated for version 7.3.379
X-Git-Tag: v7.3.379
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a528565cf1b33f629a192abfc71b0591f139f4a3;p=vim

updated for version 7.3.379
Problem:    C-indenting wrong for static enum.
Solution:   Skip over "static". (Lech Lorens)
---

diff --git a/src/misc1.c b/src/misc1.c
index 11a1f94fa..65f56f4f3 100644
--- a/src/misc1.c
+++ b/src/misc1.c
@@ -5138,6 +5138,9 @@ cin_isinit(void)
     if (STRNCMP(s, "typedef", 7) == 0 && !vim_isIDc(s[7]))
 	s = cin_skipcomment(s + 7);
 
+    if (STRNCMP(s, "static", 6) == 0 && !vim_isIDc(s[6]))
+	s = cin_skipcomment(s + 6);
+
     if (STRNCMP(s, "enum", 4) == 0 && !vim_isIDc(s[4]))
 	return TRUE;
 
diff --git a/src/testdir/test3.in b/src/testdir/test3.in
index d3911427d..6c43732ab 100644
--- a/src/testdir/test3.in
+++ b/src/testdir/test3.in
@@ -299,18 +299,25 @@ char *(array[100]) = {
 
 enum soppie
 {
-	yes = 0,
-	no,
-	maybe
+yes = 0,
+no,
+maybe
 };
 
 typedef enum soppie
 {
-	yes = 0,
-	no,
-	maybe
+yes = 0,
+no,
+maybe
 };
 
+static enum
+{
+yes = 0,
+no,
+maybe
+} soppie;
+
 {
 	int a,
 		b;
diff --git a/src/testdir/test3.ok b/src/testdir/test3.ok
index 3c0736646..ad1db8539 100644
--- a/src/testdir/test3.ok
+++ b/src/testdir/test3.ok
@@ -299,6 +299,13 @@ typedef enum soppie
 	maybe
 };
 
+static enum
+{
+	yes = 0,
+	no,
+	maybe
+} soppie;
+
 {
 	int a,
 		b;
diff --git a/src/version.c b/src/version.c
index 16abb870d..6f2f28c15 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 */
+/**/
+    379,
 /**/
     378,
 /**/