summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2018-04-17 20:14:39 +0200
committerBram Moolenaar <Bram@vim.org>2018-04-17 20:14:39 +0200
commitea3ece405ab55f44018257bd2f5021231af8e87f (patch)
treebc47904d3c2aef888a569816545490118d143df5
parent1feab2b9cc355edc2f24814c35b72ae5e74eb2ae (diff)
downloadvim-git-ea3ece405ab55f44018257bd2f5021231af8e87f.tar.gz
patch 8.0.1729: no comma after last enum itemv8.0.1729
Problem: No comma after last enum item. Solution: Add a few commas to check if this works for all compilers. Also add a few // comments.
-rw-r--r--src/structs.h54
-rw-r--r--src/version.c2
2 files changed, 29 insertions, 27 deletions
diff --git a/src/structs.h b/src/structs.h
index 92025274e..e3ad867db 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -827,9 +827,9 @@ struct msglist
*/
typedef enum
{
- ET_USER, /* exception caused by ":throw" command */
- ET_ERROR, /* error exception */
- ET_INTERRUPT /* interrupt exception triggered by Ctrl-C */
+ ET_USER, // exception caused by ":throw" command
+ ET_ERROR, // error exception
+ ET_INTERRUPT, // interrupt exception triggered by Ctrl-C
} except_type_T;
/*
@@ -1190,16 +1190,16 @@ typedef struct channel_S channel_T;
typedef enum
{
VAR_UNKNOWN = 0,
- VAR_NUMBER, /* "v_number" is used */
- VAR_STRING, /* "v_string" is used */
- VAR_FUNC, /* "v_string" is function name */
- VAR_PARTIAL, /* "v_partial" is used */
- VAR_LIST, /* "v_list" is used */
- VAR_DICT, /* "v_dict" is used */
- VAR_FLOAT, /* "v_float" is used */
- VAR_SPECIAL, /* "v_number" is used */
- VAR_JOB, /* "v_job" is used */
- VAR_CHANNEL /* "v_channel" is used */
+ VAR_NUMBER, // "v_number" is used
+ VAR_STRING, // "v_string" is used
+ VAR_FUNC, // "v_string" is function name
+ VAR_PARTIAL, // "v_partial" is used
+ VAR_LIST, // "v_list" is used
+ VAR_DICT, // "v_dict" is used
+ VAR_FLOAT, // "v_float" is used
+ VAR_SPECIAL, // "v_number" is used
+ VAR_JOB, // "v_job" is used
+ VAR_CHANNEL, // "v_channel" is used
} vartype_T;
/*
@@ -1456,8 +1456,8 @@ typedef enum
{
JOB_FAILED,
JOB_STARTED,
- JOB_ENDED, /* detected job done */
- JOB_FINISHED /* job done and cleanup done */
+ JOB_ENDED, // detected job done
+ JOB_FINISHED, // job done and cleanup done
} jobstatus_T;
/*
@@ -1531,11 +1531,11 @@ typedef enum
MODE_NL = 0,
MODE_RAW,
MODE_JSON,
- MODE_JS
+ MODE_JS,
} ch_mode_T;
typedef enum {
- JIO_PIPE, /* default */
+ JIO_PIPE, // default
JIO_NULL,
JIO_FILE,
JIO_BUFFER,
@@ -1557,7 +1557,7 @@ typedef enum {
PART_IN,
# define CH_IN_FD CH_PART_FD(PART_IN)
#endif
- PART_COUNT
+ PART_COUNT,
} ch_part_T;
#define INVALID_FD (-1)
@@ -3252,15 +3252,15 @@ typedef struct {
*/
typedef enum
{
- TYPE_UNKNOWN = 0
- , TYPE_EQUAL /* == */
- , TYPE_NEQUAL /* != */
- , TYPE_GREATER /* > */
- , TYPE_GEQUAL /* >= */
- , TYPE_SMALLER /* < */
- , TYPE_SEQUAL /* <= */
- , TYPE_MATCH /* =~ */
- , TYPE_NOMATCH /* !~ */
+ TYPE_UNKNOWN = 0,
+ TYPE_EQUAL, // ==
+ TYPE_NEQUAL, // !=
+ TYPE_GREATER, // >
+ TYPE_GEQUAL, // >=
+ TYPE_SMALLER, // <
+ TYPE_SEQUAL, // <=
+ TYPE_MATCH, // =~
+ TYPE_NOMATCH, // !~
} exptype_T;
/*
diff --git a/src/version.c b/src/version.c
index edbe2ae16..aa1e93fdd 100644
--- a/src/version.c
+++ b/src/version.c
@@ -763,6 +763,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1729,
+/**/
1728,
/**/
1727,