diff --git a/racket/src/gracket/grmain.c b/racket/src/gracket/grmain.c index 156506f8e2..415ce62132 100644 --- a/racket/src/gracket/grmain.c +++ b/racket/src/gracket/grmain.c @@ -36,6 +36,7 @@ static void pre_filter_cmdline_arguments(int *argc, char ***argv); #define MACOS9_INIT_FILENAME "PREFERENCES:gracketrc.rktl" #define INIT_FILENAME_CONF_SYM "gui-interactive-file" #define DEFAULT_INIT_MODULE "racket/gui/interactive" +#define USER_INIT_MODULE "gui-interactive.rkt" #if WIN32 # define NEED_CONSOLE_PRINTF # define DEFER_EXPLICIT_EXIT diff --git a/racket/src/racket/cmdline.inc b/racket/src/racket/cmdline.inc index ed81e2b370..fbad6aba1d 100644 --- a/racket/src/racket/cmdline.inc +++ b/racket/src/racket/cmdline.inc @@ -670,7 +670,10 @@ static int finish_cmd_line_run(FinishArgs *fa, Repl_Proc repl) #ifndef DONT_LOAD_INIT_FILE if (fa->a->use_repl && !fa->a->no_init_file) { Scheme_Object *a[2]; - a[0] = get_init_filename(fa->global_env, INIT_FILENAME_CONF_SYM, DEFAULT_INIT_MODULE); + a[0] = get_init_filename(fa->global_env, + INIT_FILENAME_CONF_SYM, + DEFAULT_INIT_MODULE, + USER_INIT_MODULE); if (a[0]) { mz_jmp_buf * volatile save, newbuf; Scheme_Thread * volatile p; diff --git a/racket/src/racket/main.c b/racket/src/racket/main.c index 40b14155ee..91a2cd87bb 100644 --- a/racket/src/racket/main.c +++ b/racket/src/racket/main.c @@ -104,7 +104,8 @@ extern BOOL WINAPI DllMain(HINSTANCE inst, ULONG reason, LPVOID reserved); */ static Scheme_Object *get_init_filename(Scheme_Env *env, char *init_filename_sym, - char *default_init_module) + char *default_init_module, + char *user_init_module) { Scheme_Object *f, *a[2], *build_path; Scheme_Thread * volatile p; @@ -121,7 +122,7 @@ static Scheme_Object *get_init_filename(Scheme_Env *env, f = scheme_builtin_value("find-system-path"); a[0] = scheme_intern_symbol("addon-dir"); a[0] = _scheme_apply(f, 1, a); - a[1] = scheme_make_path("interactive.rkt"); + a[1] = scheme_make_path(user_init_module); f = _scheme_apply(build_path, 2, a); if (SCHEME_PATHP(f)) { char *filename; @@ -178,6 +179,7 @@ extern Scheme_Object *scheme_initialize(Scheme_Env *env); # define MACOS9_INIT_FILENAME "PREFERENCES:racketrc.rktl" # define INIT_FILENAME_CONF_SYM "interactive-file" # define DEFAULT_INIT_MODULE "racket/interactive" +# define USER_INIT_MODULE "interactive.rkt" # define PRINTF printf # define PROGRAM "Racket" # define PROGRAM_LC "racket"