Skip to content
Snippets Groups Projects
Commit 67a06091 authored by Martin Simmons's avatar Martin Simmons
Browse files

Set the correct slot name error-output-stream, not error-stream.

parent 4c3fcb6f
Branches abcl-1.9.2
No related tags found
No related merge requests found
...@@ -621,7 +621,7 @@ LAUNCH-PROGRAM returns a PROCESS-INFO object." ...@@ -621,7 +621,7 @@ LAUNCH-PROGRAM returns a PROCESS-INFO object."
(prop 'process pid-or-nil) (prop 'process pid-or-nil)
(when (eq input :stream) (prop 'input-stream in-or-io)) (when (eq input :stream) (prop 'input-stream in-or-io))
(when (eq output :stream) (prop 'output-stream out-or-err)) (when (eq output :stream) (prop 'output-stream out-or-err))
(when (eq error-output :stream) (prop 'error-stream err-or-pid))) (when (eq error-output :stream) (prop 'error-output-stream err-or-pid)))
(t (t
(prop 'process err-or-pid) (prop 'process err-or-pid)
(ecase (+ (if (eq input :stream) 1 0) (if (eq output :stream) 2 0)) (ecase (+ (if (eq input :stream) 1 0) (if (eq output :stream) 2 0))
...@@ -630,7 +630,7 @@ LAUNCH-PROGRAM returns a PROCESS-INFO object." ...@@ -630,7 +630,7 @@ LAUNCH-PROGRAM returns a PROCESS-INFO object."
(2 (prop 'output-stream in-or-io)) (2 (prop 'output-stream in-or-io))
(3 (prop 'bidir-stream in-or-io))) (3 (prop 'bidir-stream in-or-io)))
(when (eq error-output :stream) (when (eq error-output :stream)
(prop 'error-stream out-or-err)))) (prop 'error-output-stream out-or-err))))
#+(or abcl clozure cmucl sbcl scl) #+(or abcl clozure cmucl sbcl scl)
(progn (progn
(prop 'process process) (prop 'process process)
...@@ -674,7 +674,7 @@ LAUNCH-PROGRAM returns a PROCESS-INFO object." ...@@ -674,7 +674,7 @@ LAUNCH-PROGRAM returns a PROCESS-INFO object."
(prop (ecase mode (1 'input-stream) (2 'output-stream) (3 'bidir-stream)) (prop (ecase mode (1 'input-stream) (2 'output-stream) (3 'bidir-stream))
io-or-pid)) io-or-pid))
(when (eq error-output :stream) (when (eq error-output :stream)
(prop 'error-stream err-or-nil))) (prop 'error-output-stream err-or-nil)))
;; Prior to Lispworks 7, this returned (pid); now it ;; Prior to Lispworks 7, this returned (pid); now it
;; returns (io err pid) of which we keep io. ;; returns (io err pid) of which we keep io.
(t (prop 'process io-or-pid))))) (t (prop 'process io-or-pid)))))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment