summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/main.c7
-rw-r--r--src/message_test.c2
-rw-r--r--src/version.c2
3 files changed, 6 insertions, 5 deletions
diff --git a/src/main.c b/src/main.c
index e3db0b2a9..6d59b09ba 100644
--- a/src/main.c
+++ b/src/main.c
@@ -89,15 +89,16 @@ static char *(main_errors[]) =
};
#ifndef PROTO /* don't want a prototype for main() */
+
+/* Various parameters passed between main() and other functions. */
+static mparm_T params;
+
#ifndef NO_VIM_MAIN /* skip this for unittests */
static char_u *start_dir = NULL; /* current working dir on startup */
static int has_dash_c_arg = FALSE;
-/* Various parameters passed between main() and other functions. */
-static mparm_T params;
-
int
# ifdef VIMDLL
_export
diff --git a/src/message_test.c b/src/message_test.c
index e5ecf2641..55ca81410 100644
--- a/src/message_test.c
+++ b/src/message_test.c
@@ -96,8 +96,6 @@ test_trunc_string(void)
int
main(int argc, char **argv)
{
- mparm_T params;
-
vim_memset(&params, 0, sizeof(params));
params.argc = argc;
params.argv = argv;
diff --git a/src/version.c b/src/version.c
index 3a6070b98..5958550f1 100644
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 540,
+/**/
539,
/**/
538,