X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Ftoplevel.lisp;h=03f4c346aa96c2dfdc1b76b0e8c9c1da1d29f44f;hb=c3699db2053ff3b5ac6a98d4431c3789496002d8;hp=5aadeec0dc69cacd447cafa8f1add8d8c0590559;hpb=dfae0cd85d45a30d8687d6a366b608d10350872f;p=sbcl.git

diff --git a/src/code/toplevel.lisp b/src/code/toplevel.lisp
index 5aadeec..03f4c34 100644
--- a/src/code/toplevel.lisp
+++ b/src/code/toplevel.lisp
@@ -49,10 +49,11 @@
     `(let ((,caught (catch '%end-of-the-world
 		      (/show0 "inside CATCH '%END-OF-THE-WORLD")
 		      ,@body)))
-       (/show0 "back from CATCH '%END-OF-THE-WORLD, flushing output")
-       (flush-standard-output-streams)
-       (/show0 "calling UNIX-EXIT")
-       (sb!unix:unix-exit ,caught))))
+      (/show0 "back from CATCH '%END-OF-THE-WORLD, flushing output")
+      (flush-standard-output-streams)
+      (sb!thread::terminate-session)
+      (/show0 "calling UNIX-EXIT")
+      (sb!unix:unix-exit ,caught))))
 
 ;;;; working with *CURRENT-ERROR-DEPTH* and *MAXIMUM-ERROR-DEPTH*
 
@@ -296,7 +297,7 @@
 (defun toplevel-init ()
 
   (/show0 "entering TOPLEVEL-INIT")
-  (setf sb!thread::*session-lock* (sb!thread:make-mutex :name "the terminal"))
+  (sb!thread::init-job-control)
   (sb!thread::get-foreground)
   (let (;; value of --sysinit option
 	(sysinit nil)