0.8.5.29:

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

diff --git a/src/code/toplevel.lisp b/src/code/toplevel.lisp
index bbfd22b..5367a75 100644 (file)
--- a/src/code/toplevel.lisp
+++ b/src/code/toplevel.lisp
@@ -405,14 +405,10 @@
                          possible-init-file-names)
               (/show0 "leaving PROBE-INIT-FILES"))))
       (let* ((sbcl-home (posix-getenv "SBCL_HOME"))
-            (sysinit-truename (if sbcl-home
-                                  (probe-init-files sysinit
-                                                    (concatenate 'string
-                                                                 sbcl-home
-                                                                 "/sbclrc"))
-                                  (probe-init-files sysinit
-                                                    "/etc/sbclrc"
-                                                    "/usr/local/etc/sbclrc")))
+            (sysinit-truename
+             (probe-init-files sysinit
+                               (concatenate 'string sbcl-home "/sbclrc")
+                               "/etc/sbclrc"))
             (user-home (or (posix-getenv "HOME")
                            (error "The HOME environment variable is unbound, ~
                                    so user init file can't be found.")))
@@ -510,7 +506,7 @@
           (abort
            "~@<Reduce debugger level (leaving debugger, returning to toplevel).~@:>")
         (catch 'toplevel-catcher
-          #!-sunos (sb!unix:unix-sigsetmask 0) ; FIXME: What is this for?
+          (sb!unix::reset-signal-mask)
           ;; in the event of a control-stack-exhausted-error, we should
           ;; have unwound enough stack by the time we get here that this
           ;; is now possible
@@ -553,6 +549,7 @@
   (loop
    ;; (See comment preceding the definition of SCRUB-CONTROL-STACK.)
    (scrub-control-stack)
+   (sb!thread::get-foreground)
    (unless noprint
      (funcall *repl-prompt-fun* *standard-output*)
      ;; (Should *REPL-PROMPT-FUN* be responsible for doing its own