[slime-cvs] CVS slime

[heller]

Update of /project/slime/cvsroot/slime
In directory clnet:/tmp/cvs-serv11589

Modified Files:
	slime.el ChangeLog 
Log Message:
Fix markers if the listener uses :values.
    
* slime.el (slime-repl-insert-result): Use slime-repl-emit-result
since handling of markers has changed.
(slime-repl-emit-result): New argument: bol.


--- /project/slime/cvsroot/slime/slime.el	2007/12/02 08:43:30	1.882
+++ /project/slime/cvsroot/slime/slime.el	2007/12/13 15:05:00	1.883
@@ -2695,10 +2695,11 @@
      (when (< slime-repl-input-start-mark (point))
        (set-marker slime-repl-input-start-mark (point))))))
 
-(defun slime-repl-emit-result (string)
+(defun slime-repl-emit-result (string &optional bol)
   ;; insert STRING and mark it as evaluation result
   (with-current-buffer (slime-output-buffer)
     (goto-char slime-repl-input-start-mark)
+    (when (and bol (not (bolp))) (insert "\n"))
     (slime-insert-propertized `(face slime-repl-result-face
                                      rear-nonsticky (face)) 
                               string)
@@ -2945,14 +2946,11 @@
     (when result
       (destructure-case result
         ((:values &rest strings)
-         (unless (bolp) (insert "\n"))
          (cond ((null strings)
-                (insert "; No value\n"))
+                (slime-repl-emit-result "; No value\n" t))
                (t
-                (dolist (string strings)
-                  (slime-propertize-region `(face slime-repl-result-face)
-                    (insert string))
-                  (insert "\n")))))))
+                (dolist (s strings) 
+                  (slime-repl-emit-result s t)))))))
     (slime-repl-insert-prompt)))
 
 (defun slime-repl-show-abort ()
--- /project/slime/cvsroot/slime/ChangeLog	2007/12/02 08:44:33	1.1254
+++ /project/slime/cvsroot/slime/ChangeLog	2007/12/13 15:05:01	1.1255
@@ -1,3 +1,9 @@
+2007-12-04  Helmut Eller  <heller at common-lisp.net>
+
+	* slime.el (slime-repl-insert-result): Use slime-repl-emit-result
+	since handling of markers has changed.
+	(slime-repl-emit-result): New argument: bol.
+
 2007-12-02  Alan Caulkins <fatman at maxint.net>
 
 	Make it possible to close listening sockets.
@@ -7,7 +13,7 @@
 	(setup-server): Store open sockets in *listener-sockets*.
 
 2007-12-02  Helmut Eller  <heller at common-lisp.net>
-	
+
 	Add hook to customize the region used by C-c C-c.
 	Useful to recognize block declarations in CMUCL sources.