0.8.12.7: Merge package locks, AKA "what can go wrong with a 3783 line patch?"

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

diff --git a/src/code/globals.lisp b/src/code/globals.lisp
index 86b3d9d..3fa2a75 100644 (file)
--- a/src/code/globals.lisp
+++ b/src/code/globals.lisp
@@ -20,13 +20,12 @@
                  *standard-readtable*
                  sb!debug:*in-the-debugger*
                  sb!debug:*stack-top-hint*
-                 sb!conditions::*handler-clusters*
-                 sb!conditions::*restart-clusters*
+                 *handler-clusters*
+                 *restart-clusters*
                  *gc-inhibit* *need-to-collect-garbage*
                  *software-interrupt-vector* *load-verbose*
                  *load-print-stuff* *in-compilation-unit*
                  *aborted-compilation-unit-count* *char-name-alist*
-                 *beep-function* *gc-notify-before* *gc-notify-after*
                  *posix-argv*))
 
 (declaim (ftype (function * *)
@@ -34,7 +33,7 @@
                assert-prompt check-type-error case-body-error print-object
                describe-object sb!pcl::check-wrapper-validity))
 
-;;; Gray streams functions not defined until after PCL is loaded.
+;;; Gray streams functions not defined until after PCL is loaded
 (declaim (ftype (function * *)
                stream-advance-to-column stream-clear-input
                stream-clear-output stream-finish-output stream-force-output