Skip to content

Commit

Permalink
patch 8.0.1213: setting 'mzschemedll' has no effect
Browse files Browse the repository at this point in the history
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 2e4cb3b
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 13 deletions.
27 changes: 14 additions & 13 deletions src/main.c
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -403,12 +403,26 @@ main
debug_break_level = params.use_debug_break_level; debug_break_level = params.use_debug_break_level;
#endif #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 #ifdef FEAT_MZSCHEME
/* /*
* Newer version of MzScheme (Racket) require earlier (trampolined) * Newer version of MzScheme (Racket) require earlier (trampolined)
* initialisation via scheme_main_setup. * initialisation via scheme_main_setup.
* Implement this by initialising it as early as possible * Implement this by initialising it as early as possible
* and splitting off remaining Vim main into vim_main2(). * and splitting off remaining Vim main into vim_main2().
* Do source startup scripts, so that 'mzschemedll' can be set.
*/ */
return mzscheme_main(); return mzscheme_main();
#else #else
Expand All @@ -427,19 +441,6 @@ main
vim_main2(void) vim_main2(void)
{ {
#ifndef NO_VIM_MAIN #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 #ifdef FEAT_EVAL
/* /*
* Read all the plugin files. * Read all the plugin files.
Expand Down
2 changes: 2 additions & 0 deletions src/version.c
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -761,6 +761,8 @@ static char *(features[]) =


static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1213,
/**/ /**/
1212, 1212,
/**/ /**/
Expand Down

0 comments on commit 2e4cb3b

Please sign in to comment.