0.6.10:

[sbcl.git] / src / code / toplevel.lisp

diff --git a/src/code/toplevel.lisp b/src/code/toplevel.lisp
index 284f73e..087a71a 100644 (file)
--- a/src/code/toplevel.lisp
+++ b/src/code/toplevel.lisp
@@ -65,21 +65,7 @@
   (let ((caught (gensym "CAUGHT")))
     `(let ((,caught (catch '%end-of-the-world
                      (/show0 "inside CATCH '%END-OF-THE-WORLD")
-                     (restart-case (progn ,@body)
-                       ;; KLUDGE: I'd like to name this restart QUIT,
-                       ;; but then people would hate me, since in CMU
-                       ;; CL, even though they have essentially the
-                       ;; same QUIT function as SBCL, the "QUIT"
-                       ;; command in the debugger means to return to
-                       ;; the toplevel, not to actually call QUIT. Oh
-                       ;; well. -- WHN 2000-11-01
-                       (end-of-the-world ()
-                         :report (lambda (s)
-                                   (format s
-                                           "Terminate the current Lisp, ~
-                                            like #'~S."
-                                           'quit))
-                         (quit))))))
+                     ,@body)))
        (/show0 "back from CATCH '%END-OF-THE-WORLD, flushing output")
        (flush-standard-output-streams)
        (/show0 "calling UNIX-EXIT")
@@ -394,11 +380,6 @@
                          possible-init-file-names)
               (/show0 "leaving PROBE-INIT-FILES"))))
       (let* ((sbcl-home (posix-getenv "SBCL_HOME"))
-            #!+sb-show(ignore1 (progn
-                                 (/show0 "SBCL-HOME=..")
-                                 (if sbcl-home
-                                     (%primitive print sbcl-home)
-                                     (%primitive print "NIL"))))
             (sysinit-truename (if sbcl-home
                                   (probe-init-files sysinit
                                                     (concatenate
@@ -411,9 +392,6 @@
             (user-home (or (posix-getenv "HOME")
                            (error "The HOME environment variable is unbound, ~
                                    so user init file can't be found.")))
-            #!+sb-show(ignore2 (progn
-                                 (/show0 "USER-HOME=..")
-                                 (%primitive print user-home)))
             (userinit-truename (probe-init-files userinit
                                                  (concatenate
                                                   'string
@@ -421,15 +399,11 @@
                                                   "/.sbclrc"))))
        (/show0 "assigned SYSINIT-TRUENAME and USERINIT-TRUENAME")
        (when sysinit-truename
-         (/show0 "SYSINIT-TRUENAME=..")
-         #!+sb-show (%primitive print sysinit-truename)
          (unless (load sysinit-truename)
            (error "~S was not successfully loaded." sysinit-truename))
          (flush-standard-output-streams))
        (/show0 "loaded SYSINIT-TRUENAME")
        (when userinit-truename
-         (/show0 "USERINIT-TRUENAME=..")
-         #!+sb-show (%primitive print userinit-truename)
          (unless (load userinit-truename)
            (error "~S was not successfully loaded." userinit-truename))
          (flush-standard-output-streams))