Merge branch 'master' into Gtk

diff --cc src/Makefile.in
Simple merge

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

diff --cc src/runtime/thread.scm
index c9b328f6d1ed4c931e68211b12fab908472dfdc8,218365943a5e598611ab90db134abc4d66aab4fa..c7a5a87fb2df8d423a60283c46d41e3f4a0f5690
--- 1/src/runtime/thread.scm
--- 2/src/runtime/thread.scm
+++ b/src/runtime/thread.scm
@@@ -246,11 -244,9 +247,10 @@@ USA
    (without-interrupts %suspend-current-thread))
  
  (define (%suspend-current-thread)
 +  (%trace ";%suspend-current-thread: "first-running-thread"\n")
    (call-with-current-thread #f
      (lambda (thread)
-       (let ((fp-env (flo:environment))
-           (block-events? (thread/block-events? thread)))
+       (let ((block-events? (thread/block-events? thread)))
        (set-thread/block-events?! thread #f)
        (maybe-signal-io-thread-events)
        (let ((any-events? (handle-thread-events thread)))
@@@ -300,9 -296,7 +300,9 @@@
    ;; Preserve the floating-point environment here to guarantee that the
    ;; thread timer won't raise or clear exceptions (particularly the
    ;; inexact result exception) that the interrupted thread cares about.
-   (let ((fp-env (flo:environment)))
 +  (%trace ";thread-timer: interrupt in "first-running-thread"\n")
+   (let ((fp-env (enter-default-float-environment first-running-thread)))
 +    (flo:set-environment! (flo:default-environment))
      (set! next-scheduled-timeout #f)
      (set-interrupt-enables! interrupt-mask/gc-ok)
      (deliver-timer-events)
@@@ -317,20 -308,11 +317,20 @@@
             (run-thread thread))
            ((not (eq? 'RUNNING-WITHOUT-PREEMPTION
                       (thread/execution-state thread)))
 +           (%trace ";thread-timer: yielding "thread" to "(thread/next thread)"\n")
             (yield-thread thread fp-env))
            (else
-            (flo:set-environment! fp-env)
 +           (%trace ";thread-timer: continuing with "thread"\n")
+            (restore-float-environment-from-default fp-env)
             (%resume-current-thread thread))))))
  
 +(define %trace? #f)
 +
 +(define-syntax %trace
 +  (syntax-rules ()
 +    ((_ . MSG)
 +     (if %trace? ((lambda () (outf-error . MSG)))))))
 +
  (define (yield-current-thread)
    (without-interrupts
     (lambda ()