From: Kevin Rosenberg <kevin@rosenberg.net>
Date: Tue, 20 May 2003 16:15:18 +0000 (+0000)
Subject: 0.8alpha.0.43:
X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=e8f691fc1ba5e3aebc74fd8723c7cc550a4f1e35;p=sbcl.git

0.8alpha.0.43:
    contrib/sb-aclrepl:
       Rework newline handling to ensure a fresh line
       Correct README file
---

diff --git a/contrib/sb-aclrepl/README b/contrib/sb-aclrepl/README
index a90a26c..c848215 100644
--- a/contrib/sb-aclrepl/README
+++ b/contrib/sb-aclrepl/README
@@ -7,12 +7,10 @@ debugger is planned.
 
 USAGE
 =====
-To start sb-aclrepl as your read-eval-print loop, you must
-put the following command in your ~/.sbclrc.
+To start sb-aclrepl as your read-eval-print loop, put the form
   (require 'sb-aclrepl)
+in your ~/.sbclrc initialization file.
 
-The reason for this is that, currently, sb-aclrepl must loaded before
-SBCL's default REPL starts.
 
 EXAMPLE ~/.sbclrc FILE
 ======================
@@ -20,19 +18,19 @@ EXAMPLE ~/.sbclrc FILE
 (ignore-errors (require 'sb-aclrepl))
 
 (when (find-package 'sb-aclrepl)
-  (push :aclrepl *features*))
-
+  (push :aclrepl cl:*features*))
 #+aclrepl
 (progn
   (setq sb-aclrepl:*max-history* 100)
-  (setf (sb-aclrepl:alias "asdc") #'(lambda (sys) (asdf:oos 'asdf:load-op sys)))
-  (sb-aclrepl:alias "l" (sys) (asdf:oos 'asdf:load-op sys))
-  (sb-aclrepl:alias "t" (sys) (asdf:oos 'asdf:test-op sys))
+  (setf (sb-aclrepl:alias "asdc") 
+       #'(lambda (sys) (asdf:operate 'asdf:compile-op sys)))
+  (sb-aclrepl:alias "l" (sys) (asdf:operate 'asdf:load-op sys))
+  (sb-aclrepl:alias "t" (sys) (asdf:operate 'asdf:test-op sys))
   ;; The 1 below means that two characaters ("up") are required
   (sb-aclrepl:alias ("up" 1 "Use package") (package) (use-package package))
   ;; The 0 below means only the first letter ("r") is required, such as ":r base64"
   (sb-aclrepl:alias ("require" 0 "Require module") (sys) (require sys))
-)
+  (setq cl:*features* (delete :aclrepl cl:*features*)))
 
 Questions, comments, or bug reports should be sent to Kevin Rosenberg
 <kevin@rosenberg.net>.
diff --git a/contrib/sb-aclrepl/repl.lisp b/contrib/sb-aclrepl/repl.lisp
index b77d107..17c2ad0 100644
--- a/contrib/sb-aclrepl/repl.lisp
+++ b/contrib/sb-aclrepl/repl.lisp
@@ -798,6 +798,7 @@
       (let ((stopped-threads (sb-thread::waitqueue-data lock)))
 	(when stopped-threads
 	  (format stream "~{~&Thread ~A suspended~}~%" stopped-threads))))
+    (fresh-line stream)
     (if (functionp *prompt*)
 	(write-string (funcall *prompt*
 			       break-level
diff --git a/contrib/sb-aclrepl/toplevel.lisp b/contrib/sb-aclrepl/toplevel.lisp
index b3f96f5..cdcc09b 100644
--- a/contrib/sb-aclrepl/toplevel.lisp
+++ b/contrib/sb-aclrepl/toplevel.lisp
@@ -57,8 +57,8 @@
       (dolist (result results)
 	;; Don't fresh-line before a result, since newline was entered by user
 	;; in *repl-read-form-fun*
-	(prin1 result)
-	(fresh-line)))))
+	(fresh-line *standard-output*)
+	(prin1 result *standard-output*)))))
 
 (defun repl-fun (noprint)
   (repl :noprint noprint :break-level 0))
diff --git a/version.lisp-expr b/version.lisp-expr
index 4dc6f81..b052be1 100644
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -17,4 +17,4 @@
 ;;; checkins which aren't released. (And occasionally for internal
 ;;; versions, especially for internal versions off the main CVS
 ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)
-"0.8alpha.0.42"
+"0.8alpha.0.43"