From: Matt Birkholz <puck@birchwood-abbey.net>
Date: Fri, 22 Aug 2014 05:47:01 +0000 (-0700)
Subject: Merge branch 'master' into Gtk.
X-Git-Tag: mit-scheme-pucked-9.2.12~402
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=ba86c8a300c23f304ca7fbbb0ef80d2fa9cf36ce;p=mit-scheme.git

Merge branch 'master' into Gtk.
---

ba86c8a300c23f304ca7fbbb0ef80d2fa9cf36ce
diff --cc src/runtime/make.scm
index 0eceb5764,6f6857fad..5fbf25630
--- a/src/runtime/make.scm
+++ b/src/runtime/make.scm
@@@ -493,6 -494,6 +494,7 @@@ USA
     (RUNTIME PATHNAME UNIX)
     (RUNTIME PATHNAME DOS)
     (RUNTIME PATHNAME)
++   (RUNTIME DIRECTORY)
     (RUNTIME WORKING-DIRECTORY)
     (RUNTIME LOAD)
     (RUNTIME SIMPLE-FILE-OPS)
diff --cc src/runtime/option.scm
index 4da5c7a0f,980ade71e..a833825ed
--- a/src/runtime/option.scm
+++ b/src/runtime/option.scm
@@@ -40,21 -38,8 +40,21 @@@ USA
  	    ((not no-error?) (error "Unknown option name:" name))
  	    (else #f)))
  
 +    (define (notifier option)
 +      (named-lambda (notify port)
 +	(if (not load-option/suppress-loading-message?)
 +	    (begin
 +	      (write-string "Loading " port)
 +	      (write-string (symbol-name option) port)
 +	      (write-string " option" port)))))
 +
      (define (load-entry entry)
 -      (for-each (lambda (thunk) (thunk)) (cdr entry))
 +      (with-notification
 +       (notifier name)
 +       (lambda ()
- 	 (fluid-let ((load/suppress-loading-message? #t))
- 	   (for-each (lambda (thunk) (thunk))
- 		     (cdr entry)))))
++	 (let-fluid load/suppress-loading-message? #t
++	   (lambda ()
++	     (for-each (lambda (thunk) (thunk)) (cdr entry))))))
        (set! loaded-options (cons name loaded-options))
        name)
  
diff --cc src/runtime/runtime.pkg
index 9714c3f96,47aade8a6..e3b67eea0
--- a/src/runtime/runtime.pkg
+++ b/src/runtime/runtime.pkg
@@@ -1614,7 -1614,7 +1614,8 @@@ USA
    (export (runtime pathname)
  	  *expand-directory-prefixes?*)
    (export ()
--	  directory-read))
++	  directory-read)
++  (initialization (initialize-package!)))
  
  (os-type-case
   ((unix)