Permalink
Browse files

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().
  • Loading branch information...
brammool committed Oct 22, 2017
1 parent 66857f4 commit 2e4cb3b042faba5efc9b5a8b4f86942a417494ce
Showing with 16 additions and 13 deletions.
  1. +14 −13 src/main.c
  2. +2 −0 src/version.c
View
@@ -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(&params);
/* Source startup scripts. */
source_startup_scripts(&params);
#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(&params);
/* Source startup scripts. */
source_startup_scripts(&params);
#ifdef FEAT_EVAL
/*
* Read all the plugin files.
View
@@ -761,6 +761,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1213,
/**/
1212,
/**/

0 comments on commit 2e4cb3b

Please sign in to comment.