Mercurial > vim

changeset 3218:0f193ef0f429 v7.3.379

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.3.379 Problem: C-indenting wrong for static enum. Solution: Skip over "static". (Lech Lorens)
author Bram Moolenaar <bram@vim.org>
date Wed, 14 Dec 2011 20:05:21 +0100
parents a0b8dd3aa406
children 8e510a5ff5e7
files src/misc1.c src/testdir/test3.in src/testdir/test3.ok src/version.c
diffstat 4 files changed, 25 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- 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;
 
--- 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;
--- 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;
--- 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,