Merge branch 'master' into Gtk.

diff --cc src/runtime/ffi.scm
Simple merge

diff --cc src/runtime/make.scm
index 0eceb57642b99addb86eab68e22f6c0104ddbd9f,6f6857fadf30a2a073bf7799f033817b27bbdc76..5fbf25630894e99c1247caed46c8d6795c02307e
--- 1/src/runtime/make.scm
--- 2/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 4da5c7a0f4e010d5e33072d833e4cbebef21e564,980ade71ec3f0a370076c1adce014cd1e14f95ba..a833825ed48559033fb3fcdc7f3803db121292b9
--- 1/src/runtime/option.scm
--- 2/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 9714c3f96cbf2220b542edcf34c90815dbdd3596,47aade8a68a864a501ac66d1aff2280afce56987..e3b67eea0e7785db0cc4aea3a0955b6e62fd8da4
--- 1/src/runtime/runtime.pkg
--- 2/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)

diff --cc tests/check.scm
Simple merge