[slime-cvs] CVS slime/contrib

[mkoeppe]

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

Modified Files:
	slime-presentations.el 
Log Message:
* swank-presentations.lisp: New file.
* slime-presentations.el: Load it.

* slime-presentations.el (slime-presentation-write): Remove id
argument.


--- /project/slime/cvsroot/slime/contrib/slime-presentations.el	2007/08/27 12:36:11	1.1
+++ /project/slime/cvsroot/slime/contrib/slime-presentations.el	2007/08/28 08:25:29	1.2
@@ -591,16 +591,14 @@
      (slime-mark-presentation-end id target))
     (t nil)))
 
-(defun slime-presentation-write (string &optional id target)
+(defun slime-presentation-write (string &optional target)
   (ecase target
     ((nil)                              ; Regular process output
      (with-current-buffer (slime-output-buffer)
        (slime-with-output-end-mark
-        (if id
-            (slime-insert-presentation string id t)
-          (slime-propertize-region '(face slime-repl-output-face
-                                          rear-nonsticky (face))
-            (insert string)))
+	(slime-propertize-region '(face slime-repl-output-face
+					rear-nonsticky (face))
+	  (insert string))
         (set-marker slime-output-end (point))
         (when (and (= (point) slime-repl-prompt-start-mark)
                    (not (bolp)))
@@ -614,11 +612,9 @@
        (let ((marker (slime-output-target-marker target)))
          (goto-char marker)
          (let ((result-start (point)))
-           (if id             
-               (slime-insert-presentation string id)
-             (slime-propertize-region `(face slime-repl-result-face
-                                             rear-nonsticky (face))
-               (insert string)))
+	   (slime-propertize-region `(face slime-repl-result-face
+					   rear-nonsticky (face))
+	     (insert string))
            ;; Move the input-start marker after the REPL result.
            (set-marker marker (point))))))
     (t
@@ -679,4 +675,9 @@
 
 (slime-presentation-init)
 
+(add-hook 'slime-connected-hook 'slime-install-presentations)
+
+(defun slime-install-presentations ()
+  (slime-eval-async '(swank:swank-require :swank-presentations)))
+
 (provide 'slime-presentations)