diff options
| -rw-r--r-- | src/main.c | 27 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 16 insertions, 13 deletions
diff --git a/src/main.c b/src/main.c index fd96f41bd..3db8efb9b 100644 --- a/src/main.c +++ b/src/main.c @@ -403,12 +403,26 @@ main debug_break_level = params.use_debug_break_level; #endif + /* Reset 'loadplugins' for "-u NONE" before "--cmd" arguments. + * Allows for setting 'loadplugins' there. */ + if (params.use_vimrc != NULL + && (STRCMP(params.use_vimrc, "NONE") == 0 + || STRCMP(params.use_vimrc, "DEFAULTS") == 0)) + p_lpl = FALSE; + + /* Execute --cmd arguments. */ + exe_pre_commands(¶ms); + + /* Source startup scripts. */ + source_startup_scripts(¶ms); + #ifdef FEAT_MZSCHEME /* * Newer version of MzScheme (Racket) require earlier (trampolined) * initialisation via scheme_main_setup. * Implement this by initialising it as early as possible * and splitting off remaining Vim main into vim_main2(). + * Do source startup scripts, so that 'mzschemedll' can be set. */ return mzscheme_main(); #else @@ -427,19 +441,6 @@ main vim_main2(void) { #ifndef NO_VIM_MAIN - /* Reset 'loadplugins' for "-u NONE" before "--cmd" arguments. - * Allows for setting 'loadplugins' there. */ - if (params.use_vimrc != NULL - && (STRCMP(params.use_vimrc, "NONE") == 0 - || STRCMP(params.use_vimrc, "DEFAULTS") == 0)) - p_lpl = FALSE; - - /* Execute --cmd arguments. */ - exe_pre_commands(¶ms); - - /* Source startup scripts. */ - source_startup_scripts(¶ms); - #ifdef FEAT_EVAL /* * Read all the plugin files. diff --git a/src/version.c b/src/version.c index 2ac4de9f1..160edbe45 100644 --- a/src/version.c +++ b/src/version.c @@ -762,6 +762,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1213, +/**/ 1212, /**/ 1211, |