Backout checkin 84f992ce50. This fixes test socket-14.11.1 and creates

failure in tests *io-1.9. Branch bug-734138ded8 to work out resolution.
2014-05-31 14:12:50 +00:00
1 changed files with 2 additions and 4 deletions
@@ -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);