Merge branch 'master' into pucked.

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

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

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

diff --cc src/imail/imail-mime.scm
Simple merge

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

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

diff --cc src/runtime/global.scm
index 9ce9b8fed9e9601a3c53bc3a3216ff34dab613c5,7d7bef281e0ecdbb07c8d2424f53c80514fe2be0..97ac8fdb2ab9ee9a50f71a87bb6ffe47e62d1722
--- 1/src/runtime/global.scm
--- 2/src/runtime/global.scm
+++ b/src/runtime/global.scm
@@@ -149,35 -149,10 +149,36 @@@ USA
  (define with-values call-with-values)
  
  (define (write-to-string object #!optional max)
-   (if (or (default-object? max) (not max))
-       (with-output-to-string (lambda () (write object)))
-       (with-output-to-truncated-string max (lambda () (write object)))))
+   ((if (or (default-object? max) (not max))
+        call-with-output-string
+        call-with-truncated-output-string)
+    (lambda (port) (write object port))))
 +
 +(define (edit . args)
 +  (let ((env (let ((package (name->package '(edwin))))
 +             (and package (package/environment package)))))
 +    (if env
 +      (apply (environment-lookup env 'edit) args)
 +      (begin
 +        (with-notification
 +         (lambda (port) (display "Loading Edwin" port))
 +         (lambda ()
 +           (parameterize*
 +            (list (cons param:suppress-loading-message? #t))
 +            (lambda ()
 +              (load-option 'EDWIN)
 +              (if (let ((DISPLAY (get-environment-variable "DISPLAY")))
 +                    (and (string? DISPLAY)
 +                         (not (string-null? DISPLAY))))
 +                  (ignore-errors (lambda () (load-option 'x11-screen))))))))
 +        (apply (environment-lookup (->environment '(edwin)) 'edit) args)))))
 +
 +(define edwin edit)
 +
 +(define (spawn-edwin . args)
 +  (let ((thread (create-thread #f (lambda () (apply edwin args)))))
 +    (detach-thread thread)
 +    thread))
  \f
  (define (pa procedure)
    (guarantee procedure? procedure 'PA)

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

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