0.8.20.6:

[sbcl.git] / contrib / sb-simple-streams / classes.lisp

diff --git a/contrib/sb-simple-streams/classes.lisp b/contrib/sb-simple-streams/classes.lisp
index a3a8cec..6007d6e 100644 (file)
--- a/contrib/sb-simple-streams/classes.lisp
+++ b/contrib/sb-simple-streams/classes.lisp
@@ -75,7 +75,7 @@
    (oc-state :initform nil)
    ;; TODO: find out what this one does
    (co-state :initform nil)
-   (external-format :initform :default)
+   (external-format :initform (find-external-format :default))
 
    ;; A fixnum (denoting a valid file descriptor), a stream, or nil if
    ;; the stream is not open for input.
@@ -132,7 +132,7 @@
    (max-out-pos :initform 0 :type fixnum)))
 
 ;;; A stream with a string as buffer.
-(def-stream-class string-simple-stream (simple-stream)
+(def-stream-class string-simple-stream (simple-stream string-stream)
   ())
 
 
@@ -191,8 +191,8 @@
     (when (any-stream-instance-flags stream :input :output)
       (when (any-stream-instance-flags stream :output)
        (ignore-errors (if abort
-                           (clear-output stream)
-                           (force-output stream))))
+                          (clear-output stream)
+                          (finish-output stream))))
       (call-next-method)
       (setf (sm input-handle stream) nil
            (sm output-handle stream) nil)