From a528565cf1b33f629a192abfc71b0591f139f4a3 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Wed, 14 Dec 2011 20:05:21 +0100 Subject: [PATCH] updated for version 7.3.379 Problem: C-indenting wrong for static enum. Solution: Skip over "static". (Lech Lorens) --- src/misc1.c | 3 +++ src/testdir/test3.in | 19 +++++++++++++------ src/testdir/test3.ok | 7 +++++++ src/version.c | 2 ++ 4 files changed, 25 insertions(+), 6 deletions(-) diff --git a/src/misc1.c b/src/misc1.c index 11a1f94fa8..65f56f4f34 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 d3911427dd..6c43732ab3 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 3c07366463..ad1db85396 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 16abb870d9..6f2f28c15c 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, /**/