diff --git a/clim/frames.lisp b/clim/frames.lisp index 633e732914b0a02058ac9711b520608709c065d4..016baad261af8e5842bddbd3f3aeb55b0e51ad7b 100644 --- a/clim/frames.lisp +++ b/clim/frames.lisp @@ -1497,14 +1497,9 @@ (frame-top-level-sheet frame))) (defmethod frame-standard-output ((frame standard-application-frame)) - ;; NOTE WORKAROUND returning `*standard-output*' instead of executing the following block, - ;; because the value found by it (during initialization of the demo) causes a "app pane not a stream" - ;; error. - *standard-output* - ;; commented out because it causes frame-not-a-stream error - #+nil(if (not (member '*standard-output* (slot-value frame + (if (not (member '*standard-output* (slot-value frame 'non-frame-stream-names))) - (or + (or (find-frame-pane-of-type frame 'application-pane) (find-frame-pane-of-type frame 'interactor-pane)) nil)) diff --git a/utils/cl-streams.lisp b/utils/cl-streams.lisp index dda1d5c6db5903067d9ce28c4a4a9899a08f147f..b9267c088c0bcdb376d49654ba844ba26fb24717 100644 --- a/utils/cl-streams.lisp +++ b/utils/cl-streams.lisp @@ -273,6 +273,9 @@ +#| +NOTE commented out to let sb-gray handle this for now. -- jacek.zlydach 2017-06-03 + (defclass FUNDAMENTAL-STREAM (#+ccl-2 stream) ()) (defmethod STREAMP ((stream fundamental-stream)) t) @@ -314,3 +317,5 @@ (defclass FUNDAMENTAL-BINARY-OUTPUT-STREAM (fundamental-output-stream fundamental-binary-stream) ()) + +|# diff --git a/utils/packages.lisp b/utils/packages.lisp index ac9b4846feeb2e2fd246ce66e4d1999cc0149406..51ebea73289cae28b4a29f96de89c6b3a22fede5 100644 --- a/utils/packages.lisp +++ b/utils/packages.lisp @@ -1021,15 +1021,16 @@ ;; Stream Proposal -- Classes and class predicates. #-clim-uses-lisp-stream-classes (:shadow - fundamental-binary-input-stream - fundamental-binary-output-stream - fundamental-binary-stream - fundamental-character-input-stream - fundamental-character-output-stream - fundamental-character-stream - fundamental-input-stream - fundamental-output-stream - fundamental-stream + ;; NOTE disabled shadowing of Grey streams symbols - currently playing with sb-grey on SBCL. -- jacek.zlydach 2017-06-03 + ;; fundamental-binary-input-stream + ;; fundamental-binary-output-stream + ;; fundamental-binary-stream + ;; fundamental-character-input-stream + ;; fundamental-character-output-stream + ;; fundamental-character-stream + ;; fundamental-input-stream + ;; fundamental-output-stream + ;; fundamental-stream input-stream-p open-stream-p output-stream-p