[Guile-commits] 03/03: Revert "Honor '%fresh-auto-compile'."

[Ludovic Courtès]

civodul pushed a commit to branch stable-2.2
in repository guile.

commit a1793bc904d947810d64175945218c2cdace38cc
Author: Ludovic Courtès <address@hidden>
Date:   Mon Jan 15 23:17:24 2018 +0100

    Revert "Honor '%fresh-auto-compile'."
    
    This reverts commit 83d4c4d622b406ec0bc9d8139ec8182fa72b5720,
    which came from a misunderstanding.
---
 libguile/load.c         | 11 ++++-------
 module/ice-9/boot-9.scm |  5 +----
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/libguile/load.c b/libguile/load.c
index 3747dd9..7b8136a 100644
--- a/libguile/load.c
+++ b/libguile/load.c
@@ -1,5 +1,5 @@
 /* Copyright (C) 1995, 1996, 1998, 1999, 2000, 2001, 2004, 2006, 2008,
- *   2009, 2010, 2011, 2012, 2013, 2014, 2017 Free Software Foundation, Inc.
+ *   2009, 2010, 2011, 2012, 2013, 2014 Free Software Foundation, Inc.
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public License
@@ -1195,16 +1195,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)))
     {
diff --git a/module/ice-9/boot-9.scm b/module/ice-9/boot-9.scm
index 751a3bc..4e51e92 100644
--- a/module/ice-9/boot-9.scm
+++ b/module/ice-9/boot-9.scm
@@ -3811,10 +3811,7 @@ when none is available, reading FILE-NAME with READER."
                                               scmstat
                                               go-file-name))))))
 
-    (let ((compiled (and scmstat
-                         (or (and (not %fresh-auto-compile)
-                                  (pre-compiled))
-                             (fallback)))))
+    (let ((compiled (and scmstat (or (pre-compiled) (fallback)))))
       (if compiled
           (begin
             (if %load-hook