[slime-cvs] CVS slime

[alendvai]

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

Modified Files:
	slime.el swank.lisp 
Log Message:
Extend :write-string with and &optional presentation id and use this in present-in-emacs


--- /project/slime/cvsroot/slime/slime.el	2006/12/19 10:55:24	1.719
+++ /project/slime/cvsroot/slime/slime.el	2006/12/20 14:29:09	1.720
@@ -2628,8 +2628,12 @@
 (defun slime-dispatch-event (event &optional process)
   (let ((slime-dispatching-connection (or process (slime-connection))))
     (destructure-case event
-      ((:write-string output)
-       (slime-write-string output))
+      ((:write-string output &optional id)
+       (if id
+           (with-current-buffer (slime-output-buffer)
+             (slime-with-output-end-mark
+              (slime-insert-presentation output id)))
+           (slime-write-string output)))
       ((:presentation-start id)
        (slime-mark-presentation-start id))
       ((:presentation-end id)
--- /project/slime/cvsroot/slime/swank.lisp	2006/12/20 14:26:46	1.439
+++ /project/slime/cvsroot/slime/swank.lisp	2006/12/20 14:29:09	1.440
@@ -1226,9 +1226,7 @@
            (if (stringp value)
                (send-to-emacs `(:write-string ,value))
                (let ((id (save-presented-object value)))
-                 (send-to-emacs `(:presentation-start ,id))
-                 (send-to-emacs `(:write-string ,(prin1-to-string value)))
-                 (send-to-emacs `(:presentation-end ,id))))))
+                 (send-to-emacs `(:write-string ,(prin1-to-string value) ,id))))))
     (map nil (let ((first-time-p t))
                (lambda (value)
                  (when (and (not first-time-p)