From 39ccc0603b367cd7176c14b5e9f0c4340b118cc1 Mon Sep 17 00:00:00 2001 From: Matt Birkholz Date: Tue, 5 Jan 2016 14:55:08 -0700 Subject: [PATCH] Remove unused load-option/suppress-loading-message?. Reduce runtime/ diffs between this branch and master. --- src/runtime/ffi.scm | 3 +-- src/runtime/option.scm | 17 ++--------------- src/runtime/runtime.pkg | 1 - 3 files changed, 3 insertions(+), 18 deletions(-) diff --git a/src/runtime/ffi.scm b/src/runtime/ffi.scm index 55025e58c..12e8d01d0 100644 --- a/src/runtime/ffi.scm +++ b/src/runtime/ffi.scm @@ -569,8 +569,7 @@ USA. (define (load-ffi-quietly) (if (not (name->package '(FFI))) (let ((kernel (lambda () - (let-fluids load-option/suppress-loading-message? #t - load/suppress-loading-message? #t + (let-fluid 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 8d8cffc69..a97bb7b0f 100644 --- a/src/runtime/option.scm +++ b/src/runtime/option.scm @@ -29,8 +29,6 @@ USA. (declare (usual-integrations)) -(define load-option/suppress-loading-message?) - (define (load-option name #!optional no-error?) (let ((no-error? (and (not (default-object? no-error?)) no-error?))) @@ -41,17 +39,7 @@ USA. (else #f))) (define (load-entry entry) - (let-fluid load/suppress-loading-message? #t - (lambda () - (if load-option/suppress-loading-message? - (for-each (lambda (thunk) (thunk)) (cdr entry)) - (with-notification - (named-lambda (load-optoin-notify port) - (write-string "Loading " port) - (write-string (symbol-name name) port) - (write-string " option" port)) - (lambda () - (for-each (lambda (thunk) (thunk)) (cdr entry))))))) + (for-each (lambda (thunk) (thunk)) (cdr entry)) (set! loaded-options (cons name loaded-options)) name) @@ -112,8 +100,7 @@ USA. (define (initialize-package!) (set! *options* (make-fluid '())) - (set! *parent* (make-fluid initial-load-options)) - (set! load-option/suppress-loading-message? (make-fluid #f))) + (set! *parent* (make-fluid initial-load-options))) (define (dummy-option-loader) unspecific) diff --git a/src/runtime/runtime.pkg b/src/runtime/runtime.pkg index 7b9a99b02..4a9bdf35a 100644 --- a/src/runtime/runtime.pkg +++ b/src/runtime/runtime.pkg @@ -3053,7 +3053,6 @@ USA. (files "option") (parent (runtime)) (export () - load-option/suppress-loading-message? *initial-options-file* define-load-option dummy-option-loader -- 2.25.1