summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-06-06 21:38:44 +0200
committerBram Moolenaar <Bram@vim.org>2016-06-06 21:38:44 +0200
commitfdd82fe365d0e287bafc71f98c039cb5af8ed827 (patch)
tree6d678a2f338ed39e4bba22b1926fc16de043c22f
parentc60954b48ec225c75558abee56c4a9cc89f84b7e (diff)
patch 7.4.1905v7.4.1905
Problem: Some compilers can't handle a double semicolon. Solution: Remove one semicolon.
-rw-r--r--src/ex_cmds.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index 8bb24c38e7..9f1db65b5a 100644
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -2542,7 +2542,7 @@ barline_parse(vir_T *virp, char_u *text, bval_T *values)
{
char_u *p = text;
char_u *nextp = NULL;
- char_u *buf = NULL;;
+ char_u *buf = NULL;
int count = 0;
int i;
int allocated = FALSE;
diff --git a/src/version.c b/src/version.c
index 8305e3947b..7e7dd48bb8 100644
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1905,
+/**/
1904,
/**/
1903,