[slime-cvs] CVS slime

[CVS User heller]

Update of /project/slime/cvsroot/slime
In directory cl-net:/tmp/cvs-serv6373

Modified Files:
	ChangeLog slime.el swank.lisp 
Log Message:
Reset the stream column to 0 after eval requests.

* swank.lisp (interactive-eval, eval-region): Use FRESH-LINE
to reset the stream column.
* slime.el (test repl-test): Adjust test accordingly.

--- /project/slime/cvsroot/slime/ChangeLog	2008/12/09 07:48:10	1.1596
+++ /project/slime/cvsroot/slime/ChangeLog	2008/12/09 07:48:20	1.1597
@@ -1,5 +1,13 @@
 2008-12-09  Helmut Eller  <heller at common-lisp.net>
 
+	Reset the stream column to 0 after eval requests.
+
+	* swank.lisp (interactive-eval, eval-region): Use FRESH-LINE
+	to reset the stream column.
+	* slime.el (test repl-test): Adjust test accordingly.
+
+2008-12-09  Helmut Eller  <heller at common-lisp.net>
+
 	Be a bit more careful when computing the toplevel restart.
 
 	* swank.lisp (throw-to-toplevel): Test *sldb-quit-restart* for
--- /project/slime/cvsroot/slime/slime.el	2008/12/09 07:48:10	1.1074
+++ /project/slime/cvsroot/slime/slime.el	2008/12/09 07:48:20	1.1075
@@ -9232,10 +9232,12 @@
 {}3
 SWANK> *[]")
       ("(princ 10)" "SWANK> (princ 10)
-{10}10
+{10
+}10
 SWANK> *[]")
       ("(princ 10)(princ 20)" "SWANK> (princ 10)(princ 20)
-{1020}20
+{1020
+}20
 SWANK> *[]")
       ("(dotimes (i 10 77) (princ i) (terpri))" 
        "SWANK> (dotimes (i 10 77) (princ i) (terpri))
@@ -9263,10 +9265,32 @@
        "SWANK> (progn (princ 10) (abort))
 {10}; Evaluation aborted.
 SWANK> *[]")
+      ("(if (fresh-line) 1 0)"
+       "SWANK> (if (fresh-line) 1 0)
+{
+}1
+SWANK> *[]")
       ("(values 1 2 3)" "SWANK> (values 1 2 3)
 {}1
 2
 3
+SWANK> *[]")
+      ("(with-standard-io-syntax
+         (write (make-list 15 :initial-element '(1 . 2)) :pretty t) 0)"
+       "SWANK> (with-standard-io-syntax
+         (write (make-list 15 :initial-element '(1 . 2)) :pretty t) 0)
+{((1 . 2) (1 . 2) (1 . 2) (1 . 2) (1 . 2) (1 . 2) (1 . 2) (1 . 2) (1 . 2)
+ (1 . 2) (1 . 2) (1 . 2) (1 . 2) (1 . 2) (1 . 2))
+}0
+SWANK> *[]")
+      ;; Two times to test the effect of FRESH-LINE.
+      ("(with-standard-io-syntax
+         (write (make-list 15 :initial-element '(1 . 2)) :pretty t) 0)"
+       "SWANK> (with-standard-io-syntax
+         (write (make-list 15 :initial-element '(1 . 2)) :pretty t) 0)
+{((1 . 2) (1 . 2) (1 . 2) (1 . 2) (1 . 2) (1 . 2) (1 . 2) (1 . 2) (1 . 2)
+ (1 . 2) (1 . 2) (1 . 2) (1 . 2) (1 . 2) (1 . 2))
+}0
 SWANK> *[]"))
   (with-current-buffer (slime-output-buffer)
     (setf (slime-lisp-package-prompt-string) "SWANK"))
--- /project/slime/cvsroot/slime/swank.lisp	2008/12/09 07:48:10	1.611
+++ /project/slime/cvsroot/slime/swank.lisp	2008/12/09 07:48:20	1.612
@@ -1891,6 +1891,7 @@
   (with-buffer-syntax ()
     (with-retry-restart (:msg "Retry SLIME interactive evaluation request.")
       (let ((values (multiple-value-list (eval (from-string string)))))
+        (fresh-line)
         (finish-output)
         (format-values-for-echo-area values)))))
 
@@ -1912,6 +1913,8 @@
       (loop
        (let ((form (read stream nil stream)))
          (when (eq form stream)
+           (fresh-line)
+           (finish-output)
            (return (values values -)))
          (setq - form)
          (setq values (multiple-value-list (eval form)))