0.8alpha.0.43:

[sbcl.git] / contrib / sb-aclrepl / repl.lisp

diff --git a/contrib/sb-aclrepl/repl.lisp b/contrib/sb-aclrepl/repl.lisp
index 7ae4fa1..17c2ad0 100644 (file)
--- a/contrib/sb-aclrepl/repl.lisp
+++ b/contrib/sb-aclrepl/repl.lisp
@@ -144,7 +144,7 @@
     (maybe-return-history-cmd cmd cmd-args-string)))
 
 (defun maybe-return-history-cmd (cmd cmd-args-string)
-  (format *output* "~&~A" (user-cmd-input cmd))
+  (format *output* "~A~%" (user-cmd-input cmd))
   (let ((dont-redo
         (when (and (stringp cmd-args-string)
                    (plusp (length cmd-args-string))
@@ -156,8 +156,8 @@
                (when (string-equal line "N")
                  t))
             (when line
-              (format *output* "~&Type \"y\" for yes or \"n\" for no."))
-            (format *output* "~&redo? [y] ")
+              (format *output* "Type \"y\" for yes or \"n\" for no.~%"))
+            (format *output* "redo? [y] ")
             (force-output *output*)))))
     (if dont-redo
        *null-cmd*
@@ -180,7 +180,7 @@
 (defun process-history-search (pattern cmd-args-string)
   (let ((cmd (find-history-matching-pattern pattern)))
     (unless cmd
-      (format *output* "No match on history list with pattern ~S" pattern)
+      (format *output* "No match on history list with pattern ~S~%" pattern)
       (return-from process-history-search *null-cmd*))
     (maybe-return-history-cmd cmd cmd-args-string)))
 
@@ -411,6 +411,7 @@
 
 (defun apropos-cmd (string)
   (apropos (string-upcase string))
+  (fresh-line *output*)
   (values))
 
 (let ((last-files-loaded nil))
@@ -797,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
@@ -815,7 +817,7 @@
          (error ()
            (format stream "~&Prompt error>  "))
          (:no-error (prompt)
-           (format stream "~&~A" prompt))))))
+           (format stream "~A" prompt))))))
   
 (defun process-cmd (user-cmd)
   ;; Processes a user command. Returns t if the user-cmd was a top-level
@@ -839,7 +841,7 @@
        ((functionp (user-cmd-func user-cmd))
         (add-to-history user-cmd)
         (apply (user-cmd-func user-cmd) (user-cmd-args user-cmd))
-        (fresh-line)
+        ;;(fresh-line)
         t)
        (t
         (add-to-history user-cmd)