Mercurial > vim
changeset 12670:d348256f04d1 v8.0.1213
patch 8.0.1213: setting 'mzschemedll' has no effect
commit https://github.com/vim/vim/commit/2e4cb3b042faba5efc9b5a8b4f86942a417494ce
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Oct 22 21:11:17 2017 +0200
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().
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Sun, 22 Oct 2017 21:15:04 +0200 |
parents | ca2f8c7ca804 |
children | cb54d8bb3344 |
files | src/main.c src/version.c |
diffstat | 2 files changed, 16 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- 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.