diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-10-10 11:20:26 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-10-10 11:20:26 (GMT) |
| commit | d2a2b049b7c5feb85ff42db0ff3f6409eb4a6d57 (patch) | |
| tree | 4e2b07ca837a73b342cb607bf42ebe4900547106 /generic/tclIO.c | |
| parent | 131bf290a5636e060b6c449c70a78bd74f3eba07 (diff) | |
| parent | 3f7f7c5584f701f2fee77dc372b824b15b1a7739 (diff) | |
| download | tcl-d2a2b049b7c5feb85ff42db0ff3f6409eb4a6d57.zip tcl-d2a2b049b7c5feb85ff42db0ff3f6409eb4a6d57.tar.gz tcl-d2a2b049b7c5feb85ff42db0ff3f6409eb4a6d57.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'generic/tclIO.c')
| -rw-r--r-- | generic/tclIO.c | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/generic/tclIO.c b/generic/tclIO.c index ca5537e..5f831c9 100644 --- a/generic/tclIO.c +++ b/generic/tclIO.c @@ -4363,7 +4363,6 @@ Write( * Transfer encoding strict/nocomplain option to the encoding flags */ - if (GotFlag(statePtr, CHANNEL_ENCODING_STRICT)) { statePtr->outputEncodingFlags |= TCL_ENCODING_STRICT; } else if (GotFlag(statePtr, CHANNEL_ENCODING_NOCOMPLAIN)) { @@ -8280,14 +8279,7 @@ Tcl_SetChannelOption( return TCL_ERROR; } if (newMode) { - if (GotFlag(statePtr, CHANNEL_ENCODING_STRICT)) { - if (interp) { - Tcl_SetObjResult(interp, Tcl_NewStringObj( - "-nocomplainencoding cannot be used with -strictencoding", - -1)); - } - return TCL_ERROR; - } + ResetFlag(statePtr, CHANNEL_ENCODING_STRICT); SetFlag(statePtr, CHANNEL_ENCODING_NOCOMPLAIN); } else { ResetFlag(statePtr, CHANNEL_ENCODING_NOCOMPLAIN); @@ -8300,14 +8292,7 @@ Tcl_SetChannelOption( return TCL_ERROR; } if (newMode) { - if (GotFlag(statePtr, CHANNEL_ENCODING_NOCOMPLAIN)) { - if (interp) { - Tcl_SetObjResult(interp, Tcl_NewStringObj( - "-strictencoding cannot be used with -nocomplainencoding", - -1)); - } - return TCL_ERROR; - } + ResetFlag(statePtr, CHANNEL_ENCODING_NOCOMPLAIN); SetFlag(statePtr, CHANNEL_ENCODING_STRICT); } else { ResetFlag(statePtr, CHANNEL_ENCODING_STRICT); |