From: Matt Birkholz <matt@birchwood-abbey.net>
Date: Tue, 9 Aug 2016 20:45:18 +0000 (-0700)
Subject: Merge branch 'master' into Gtk.
X-Git-Tag: mit-scheme-pucked-9.2.12~265
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=accb16d97932c4e9fec4d7b5ec99eca88114e2c4;p=mit-scheme.git

Merge branch 'master' into Gtk.
---

accb16d97932c4e9fec4d7b5ec99eca88114e2c4
diff --cc src/runtime/ed-ffi.scm
index 7baaea2d6,7f15cf7e0..2df46ed32
--- a/src/runtime/ed-ffi.scm
+++ b/src/runtime/ed-ffi.scm
@@@ -182,8 -201,11 +199,10 @@@ USA
      ("vector"	(runtime vector))
      ("version"	(runtime))
      ("where"	(runtime environment-inspector))
+     ("w32-registry" (runtime win32-registry))
      ("wind"	(runtime state-space))
+     ("world-report" (runtime world-report))
      ("wrkdir"	(runtime working-directory))
      ("wttree"	(runtime wt-tree))
 -    ("x11graph"	(runtime X-graphics))
      ("xeval"	(runtime extended-scode-eval))
      ("ystep"	(runtime stepper))))