Skip to content

Commit 75eaa81

Browse files
committed
updated for version 7.3.379
Problem: C-indenting wrong for static enum. Solution: Skip over "static". (Lech Lorens)
1 parent fe541bf commit 75eaa81

File tree

4 files changed

+25
-6
lines changed

4 files changed

+25
-6
lines changed

src/misc1.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5138,6 +5138,9 @@ cin_isinit(void)
51385138
if (STRNCMP(s, "typedef", 7) == 0 && !vim_isIDc(s[7]))
51395139
s = cin_skipcomment(s + 7);
51405140

5141+
if (STRNCMP(s, "static", 6) == 0 && !vim_isIDc(s[6]))
5142+
s = cin_skipcomment(s + 6);
5143+
51415144
if (STRNCMP(s, "enum", 4) == 0 && !vim_isIDc(s[4]))
51425145
return TRUE;
51435146

src/testdir/test3.in

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -299,18 +299,25 @@ char *(array[100]) = {
299299

300300
enum soppie
301301
{
302-
yes = 0,
303-
no,
304-
maybe
302+
yes = 0,
303+
no,
304+
maybe
305305
};
306306

307307
typedef enum soppie
308308
{
309-
yes = 0,
310-
no,
311-
maybe
309+
yes = 0,
310+
no,
311+
maybe
312312
};
313313

314+
static enum
315+
{
316+
yes = 0,
317+
no,
318+
maybe
319+
} soppie;
320+
314321
{
315322
int a,
316323
b;

src/testdir/test3.ok

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -299,6 +299,13 @@ typedef enum soppie
299299
maybe
300300
};
301301

302+
static enum
303+
{
304+
yes = 0,
305+
no,
306+
maybe
307+
} soppie;
308+
302309
{
303310
int a,
304311
b;

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -714,6 +714,8 @@ static char *(features[]) =
714714

715715
static int included_patches[] =
716716
{ /* Add new patch number below this line */
717+
/**/
718+
379,
717719
/**/
718720
378,
719721
/**/

0 commit comments

Comments
 (0)