diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2018-01-15 23:17:24 +0100 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2018-08-07 11:37:11 +0200 |
| commit | 2245c67c379ad62da77e68b5daa8e00b3833f9ff (patch) | |
| tree | 9cf5348f712d4fc63837c28dae495ca5c9a3dc65 /libguile/load.c | |
| parent | de7943a42b3a4e4e1b57126200b78c580cf5e198 (diff) | |
| download | guile-2245c67c379ad62da77e68b5daa8e00b3833f9ff.tar.gz | |
Revert "Honor '%fresh-auto-compile'."
This reverts commit 83d4c4d622b406ec0bc9d8139ec8182fa72b5720,
which came from a misunderstanding.
Diffstat (limited to 'libguile/load.c')
| -rw-r--r-- | libguile/load.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/libguile/load.c b/libguile/load.c index e9d3e6c64..aac789ba9 100644 --- a/libguile/load.c +++ b/libguile/load.c @@ -1202,16 +1202,13 @@ SCM_DEFINE (scm_primitive_load_path, "primitive-load-path", 0, 0, 1, *scm_loc_load_extensions, SCM_BOOL_F, &stat_source); - if (scm_is_false (*scm_loc_fresh_auto_compile)) - compiled_thunk = load_thunk_from_path (filename, full_filename, - &stat_source, - &found_stale_compiled_file); - else - compiled_thunk = SCM_BOOL_F; + compiled_thunk = load_thunk_from_path (filename, full_filename, &stat_source, + &found_stale_compiled_file); if (scm_is_false (compiled_thunk) && scm_is_true (full_filename) && scm_is_true (*scm_loc_compile_fallback_path) + && scm_is_false (*scm_loc_fresh_auto_compile) && scm_is_pair (*scm_loc_load_compiled_extensions) && scm_is_string (scm_car (*scm_loc_load_compiled_extensions))) { |