X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=contrib%2Fsb-aclrepl%2Frepl.lisp;h=41c685dd28e68fdb2831fb2e0574af6b48778606;hb=cd683d6d402b84a79fbb248d52047b59df7f8d38;hp=e31f696ac07dc74c09cd153c99912bbf598d180e;hpb=dfae0cd85d45a30d8687d6a366b608d10350872f;p=sbcl.git

diff --git a/contrib/sb-aclrepl/repl.lisp b/contrib/sb-aclrepl/repl.lisp
index e31f696..41c685d 100644
--- a/contrib/sb-aclrepl/repl.lisp
+++ b/contrib/sb-aclrepl/repl.lisp
@@ -622,7 +622,7 @@
   (values))
 
 (defun reset-cmd ()
-  (invoke-restart-interactively (find-restart 'sb-impl::toplevel)))
+  (throw 'sb-impl::toplevel-catcher nil))
 
 (defun dirs-cmd ()
   (dolist (dir *dir-stack*)
@@ -760,29 +760,23 @@
   (and (characterp x)
        (or (char= x #\space)
 	   (char= x #\tab)
+	   (char= x #\page)
 	   (char= x #\newline)
 	   (char= x #\return))))
 
 (defun whitespace-char-not-newline-p (x)
   (and (whitespace-char-p x)
        (not (char= x #\newline))))
-
 
 ;;;; linking into SBCL hooks
 
-
 (defun repl-prompt-fun (stream)
   (let ((break-level (when (plusp *break-level*)
 		       *break-level*))
 	(frame-number (when (and (plusp *break-level*)
 				 sb-debug::*current-frame*)
 			(sb-di::frame-number sb-debug::*current-frame*))))
-    #+sb-thread
-    (let ((lock sb-thread::*session-lock*))
-      (sb-thread::get-foreground)
-      (let ((stopped-threads (sb-thread::waitqueue-data lock)))
-	(when stopped-threads
-	  (format stream "~{~&Thread ~A suspended~}~%" stopped-threads))))
+    (sb-thread::get-foreground)
     (fresh-line stream)
     (if (functionp *prompt*)
 	(write-string (funcall *prompt*
@@ -817,7 +811,7 @@
 	((eq (user-cmd-func user-cmd) :cmd-error)
 	 (format *output* "Unknown top-level command: ~s.~%"
 		 (user-cmd-input user-cmd))
-	 (format *output* "Type `:help' for the list of commands.~%")
+	 (format *output* "Type `~Ahelp' for the list of commands.~%" *command-char*)
 	 t)
 	((eq (user-cmd-func user-cmd) :history-error)
 	 (format *output* "Input numbered ~d is not on the history list~%"