diff options
| author | dgp <dgp@users.sourceforge.net> | 2014-05-31 14:12:50 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2014-05-31 14:12:50 (GMT) |
| commit | 21df44bb890a735b7857e4d9cf83e772055faaea (patch) | |
| tree | f361e24c44ec2d126c9a844630cce691d1b196d2 | |
| parent | 46ab1371a7cbd2e6d244d043a47d5123a716be33 (diff) | |
| download | tcl-bug_734138ded8.zip tcl-bug_734138ded8.tar.gz tcl-bug_734138ded8.tar.bz2 | |
Backout checkin 84f992ce50. This fixes test socket-14.11.1 and createsbug_734138ded8
failure in tests *io-1.9. Branch bug-734138ded8 to work out resolution.
| -rw-r--r-- | generic/tclIO.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/generic/tclIO.c b/generic/tclIO.c index 7d94037..0ed6018 100644 --- a/generic/tclIO.c +++ b/generic/tclIO.c @@ -3287,8 +3287,7 @@ Tcl_Close( stickyError = 0; - if ((statePtr->encoding != NULL) - && !(statePtr->outputEncodingFlags & TCL_ENCODING_START) + if ((statePtr->encoding != NULL) && (statePtr->curOutPtr != NULL) && (CheckChannelErrors(statePtr, TCL_WRITABLE) == 0)) { statePtr->outputEncodingFlags |= TCL_ENCODING_END; if (WriteChars(chanPtr, "", 0) < 0) { @@ -7709,8 +7708,7 @@ Tcl_SetChannelOption( * iso2022, the terminated escape sequence must write to the buffer. */ - if ((statePtr->encoding != NULL) - && !(statePtr->outputEncodingFlags & TCL_ENCODING_START) + if ((statePtr->encoding != NULL) && (statePtr->curOutPtr != NULL) && (CheckChannelErrors(statePtr, TCL_WRITABLE) == 0)) { statePtr->outputEncodingFlags |= TCL_ENCODING_END; WriteChars(chanPtr, "", 0); |