From: Matt Birkholz <matt@birchwood-abbey.net>
Date: Sun, 23 Apr 2017 18:06:34 +0000 (-0700)
Subject: Merge branch 'master' into pucked.
X-Git-Tag: mit-scheme-pucked-9.2.12~158
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=bf4e50ac8a4922d016e7c97ae5ffe9a939070723;p=mit-scheme.git

Merge branch 'master' into pucked.
---

bf4e50ac8a4922d016e7c97ae5ffe9a939070723
diff --cc src/runtime/ed-ffi.scm
index 219b13d00,ea05763f3..3dd670ce0
--- a/src/runtime/ed-ffi.scm
+++ b/src/runtime/ed-ffi.scm
@@@ -121,8 -122,8 +121,7 @@@ USA
      ("packag"	(package))
      ("parse"	(runtime parser))
      ("parser-buffer" (runtime parser-buffer))
-     ("partab"	(runtime parser-table))
      ("pathnm"	(runtime pathname))
 -    ("pgsql"	(runtime postgresql))
      ("poplat"	(runtime population))
      ("port"	(runtime port))
      ("pp"	(runtime pretty-printer))
diff --cc tests/check.scm
index 0ee1cf5b5,22e57e7f9..1ccdec9cc
--- a/tests/check.scm
+++ b/tests/check.scm
@@@ -69,9 -70,10 +70,10 @@@ USA
      "runtime/test-readwrite"
      "runtime/test-regsexp"
      "runtime/test-string"
+     "runtime/test-string-normalization"
      "runtime/test-url"
      ("runtime/test-wttree" (runtime wt-tree))
 -    ;;"ffi/test-ffi"
 +    "ffi/test-ffi.scm"
      ))
  
  (with-working-directory-pathname