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 11a1f94fa8f6a3b65550974f30152bbf27f46d94..65f56f4f34be9bc6f1841c52e4197b01c529b1bf 100644 (file)
--- 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 d3911427dd3ddf434488be8e8b427fc8db782938..6c43732ab3bcbf150d389bb807175c085745f794 100644 (file)
--- 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 3c07366463cbdf4364d2dd4ef18104d9ff61fcd7..ad1db85396cfde45c7164ce474ed879a0ce8e8ec 100644 (file)
--- 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 16abb870d94261f988458e74e9ecd85745d8f54c..6f2f28c15cdd1b74c11e6fef25ad4afb6192dd97 100644 (file)
--- 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,
 /**/