gtk: Fix and fluidize load-option/suppress-loading-message?.

diff --git a/src/runtime/ffi.scm b/src/runtime/ffi.scm
index a2eb5752ffd1b177499c4a038b6b7336363637e7..b8ebdf251b3755241bdcc7fb969ec7238ed93b0c 100644 (file)
--- a/src/runtime/ffi.scm
+++ b/src/runtime/ffi.scm
@@ -551,7 +551,8 @@ USA.
 (define (load-ffi-quietly)
   (if (not (name->package '(FFI)))
       (let ((kernel (lambda ()
-                     (let-fluid load/suppress-loading-message? #t
+                     (let-fluids load-option/suppress-loading-message? #t
+                                 load/suppress-loading-message? #t
                        (lambda ()
                          (load-option 'FFI))))))
        (if (nearest-cmdl/batch-mode?)

diff --git a/src/runtime/option.scm b/src/runtime/option.scm
index d5aabc9cd0b9ce7e56e9c69ea99e0f365c9b44a2..e2eff9432ea5a9e388566b21c7fc13fa574a366d 100644 (file)
--- a/src/runtime/option.scm
+++ b/src/runtime/option.scm
@@ -29,7 +29,7 @@ USA.
 
 (declare (usual-integrations))
 \f
-(define load-option/suppress-loading-message? #f)
+(define load-option/suppress-loading-message?)
 
 (define (load-option name #!optional no-error?)
   (let ((no-error? (and (not (default-object? no-error?)) no-error?)))
@@ -42,7 +42,7 @@ USA.
 
     (define (notifier option)
       (named-lambda (notify port)
-       (if (not load-option/suppress-loading-message?)
+       (if (not (fluid load-option/suppress-loading-message?))
            (begin
              (write-string "Loading " port)
              (write-string (symbol-name option) port)
@@ -115,7 +115,8 @@ USA.
 
 (define (initialize-package!)
   (set! *options* (make-fluid '()))
-  (set! *parent* (make-fluid initial-load-options)))
+  (set! *parent* (make-fluid initial-load-options))
+  (set! load-option/suppress-loading-message? (make-fluid #f)))
 \f
 (define (dummy-option-loader)
   unspecific)

diff --git a/src/runtime/runtime.pkg b/src/runtime/runtime.pkg
index 4812034aa3e318f582b9d8794b458fe0a4bfb161..e3de7bd46543a2aea1f01cbfc5d8defac5886a9a 100644 (file)
--- a/src/runtime/runtime.pkg
+++ b/src/runtime/runtime.pkg
@@ -3007,6 +3007,7 @@ USA.
   (files "option")
   (parent (runtime))
   (export ()
+         load-option/suppress-loading-message?
          *initial-options-file*
          define-load-option
          dummy-option-loader
@@ -3343,8 +3344,7 @@ USA.
          link-shim
          install-shim
          install-load-option
-         install-html
-         load-option/suppress-loading-message?)
+         install-html)
   (initialization (initialize-package!)))
 
 (define-package (runtime program-copier)