[slime-cvs] CVS slime/contrib

[mkoeppe]

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

Modified Files:
	swank-presentation-streams.lisp 
Log Message:
(slime-stream-p) [cmu]: Use the return value of slime-stream-p rather
than the global variable *use-dedicated-output-stream* to decide
whether printing through pretty streams is safe for the layout.


--- /project/slime/cvsroot/slime/contrib/swank-presentation-streams.lisp	2007/08/25 00:51:52	1.1
+++ /project/slime/cvsroot/slime/contrib/swank-presentation-streams.lisp	2007/08/25 01:10:24	1.2
@@ -85,14 +85,21 @@
 			     (slime-stream-p (lisp::indenting-stream-stream stream)))
 			(and (typep stream 'pretty-print::pretty-stream)
 			     (fboundp 'pretty-print::enqueue-annotation)
-			     (not *use-dedicated-output-stream*)
-			     ;; Printing through CMUCL pretty streams
-			     ;; is only cleanly possible if we are
-			     ;; using the bridge-less protocol with
-			     ;; annotations, because the bridge escape
-			     ;; sequences disturb the pretty printer
-			     ;; layout.
-			     (slime-stream-p (pretty-print::pretty-stream-target  stream))))
+			     (let ((slime-stream-p
+				    (slime-stream-p (pretty-print::pretty-stream-target stream))))
+			       (and ;; Printing through CMUCL pretty
+				    ;; streams is only cleanly
+				    ;; possible if we are using the
+				    ;; bridge-less protocol with
+				    ;; annotations, because the bridge
+				    ;; escape sequences disturb the
+				    ;; pretty printer layout.
+				    (not (eql slime-stream-p :dedicated-output))
+				    ;; If OK, return the return value
+				    ;; we got from slime-stream-p on
+				    ;; the target stream (could be
+				    ;; :repl-result):
+				    slime-stream-p))))
 		    #+sbcl
 		    (let ()
 		      (declare (notinline sb-pretty::pretty-stream-target))