# HG changeset patch # User Bram Moolenaar # Date 1323889521 -3600 # Node ID 0f193ef0f4298ed632b5e9dc88c7efefe093728b # Parent a0b8dd3aa40689f259594e546f5c82af565c3abb 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 --- 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 --- 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 --- 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 --- a/src/version.c +++ b/src/version.c @@ -715,6 +715,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 379, +/**/ 378, /**/ 377,