diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-10-22 21:11:17 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-10-22 21:11:17 +0200 |
| commit | 2e4cb3b042faba5efc9b5a8b4f86942a417494ce (patch) | |
| tree | c87231441ef9d00f521c2f970f1431993b2f1893 /src/main.c | |
| parent | 66857f410426ca335f4771a58a32b2d14a7e52b9 (diff) | |
| download | vim-2e4cb3b042faba5efc9b5a8b4f86942a417494ce.zip | |
patch 8.0.1213: setting 'mzschemedll' has no effect
Problem: Setting 'mzschemedll' has no effect.
Solution: Move loading .vimrc to before call to mzscheme_main().
Diffstat (limited to 'src/main.c')
| -rw-r--r-- | src/main.c | 27 |
1 files changed, 14 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. |