Merge branch 'master' into Gtk.

diff --cc src/berkeley-db/berkeley-db.scm
Simple merge

diff --cc src/edwin/decls.scm
Simple merge

diff --cc src/edwin/editor.scm
Simple merge

diff --cc src/edwin/edwin.ldr
Simple merge

diff --cc src/edwin/edwin.pkg
Simple merge

diff --cc src/edwin/edwin.sf
index 36887a4c290db4294ddbb8df2bddffc255049ec4,b0ddb5f0ccf7dca5ddef7dd993f7f955a6290232..7cb405f8216aebf47376d2bf9376e5cc713e107d
--- 1/src/edwin/edwin.sf
--- 2/src/edwin/edwin.sf
+++ b/src/edwin/edwin.sf
@@@ -34,9 -29,16 +34,16 @@@ USA
  (if (not (name->package '(EDWIN)))
      (let ((package-set (package-set-pathname "edwin")))
        (if (not (file-exists? package-set))
 -        (cref/generate-trivial-constructor "edwin"))
 +        (cref/generate-trivial-constructor "edwin" #f))
        (construct-packages-from-file (fasload package-set))))
  
+ (if (lexical-unreferenceable? (->environment '(EDWIN STRING))
+                             'STRING?)
+     (begin
+       (fluid-let ((sf/default-syntax-table (->environment '(EDWIN))))
+       (sf-conditionally "string"))
+       (load "string.bin" '(EDWIN STRING))))
+ 
  (if (lexical-unreferenceable? (->environment '(EDWIN CLASS-CONSTRUCTOR))
                              'CLASS-DESCRIPTORS)
      (begin

diff --cc src/edwin/kilcom.scm
Simple merge

diff --cc src/edwin/tterm.scm
Simple merge

diff --cc src/pgsql/pgsql.scm
Simple merge

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

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

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

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

diff --cc src/runtime/runtime.pkg
Simple merge

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

diff --cc tests/check.scm
Simple merge