diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-12-15 14:39:26 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-12-15 14:39:26 (GMT) |
| commit | 10775523d9f98fb59205ef2e7c871639a176d013 (patch) | |
| tree | de9d1f70b9bee4481accd746e46c91a7817a5b64 | |
| parent | 532559323e22f7dd676bd9bbd6c6ea983dfd8e12 (diff) | |
| parent | 7b36aa11b6880b342a177a864601d97d839b7279 (diff) | |
| download | tcl-10775523d9f98fb59205ef2e7c871639a176d013.zip tcl-10775523d9f98fb59205ef2e7c871639a176d013.tar.gz tcl-10775523d9f98fb59205ef2e7c871639a176d013.tar.bz2 | |
Merge 8.7
| -rw-r--r-- | generic/tclIO.c | 2 | ||||
| -rw-r--r-- | tests/winConsole.test | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/generic/tclIO.c b/generic/tclIO.c index 0eb6881..f2618c1 100644 --- a/generic/tclIO.c +++ b/generic/tclIO.c @@ -7810,7 +7810,7 @@ Tcl_BadChannelOption( { if (interp != NULL) { const char *genericopt = - "blocking buffering buffersize encoding eofchar translation"; + "blocking buffering buffersize encoding eofchar nocomplainencoding strictencoding translation"; const char **argv; size_t argc, i; Tcl_DString ds; diff --git a/tests/winConsole.test b/tests/winConsole.test index 821a143..b04f3e9 100644 --- a/tests/winConsole.test +++ b/tests/winConsole.test @@ -224,7 +224,7 @@ test console-fconfigure-get-1.[incr testnum] { fconfigure -winsize } -constraints {win interactive} -body { fconfigure stdin -winsize -} -result {bad option "-winsize": should be one of -blocking, -buffering, -buffersize, -encoding, -eofchar, -translation, or -inputmode} -returnCodes error +} -result {bad option "-winsize": should be one of -blocking, -buffering, -buffersize, -encoding, -eofchar, -nocomplainencoding, -strictencoding, -translation, or -inputmode} -returnCodes error ## fconfigure get stdout/stderr foreach chan {stdout stderr} major {2 3} { @@ -260,7 +260,7 @@ foreach chan {stdout stderr} major {2 3} { fconfigure -inputmode } -constraints {win interactive} -body { fconfigure $chan -inputmode - } -result {bad option "-inputmode": should be one of -blocking, -buffering, -buffersize, -encoding, -eofchar, -translation, or -winsize} -returnCodes error + } -result {bad option "-inputmode": should be one of -blocking, -buffering, -buffersize, -encoding, -eofchar, -nocomplainencoding, -strictencoding, -translation, or -winsize} -returnCodes error } @@ -330,7 +330,7 @@ test console-fconfigure-set-1.3 { fconfigure stdin -winsize } -constraints {win interactive} -body { fconfigure stdin -winsize {10 30} -} -result {bad option "-winsize": should be one of -blocking, -buffering, -buffersize, -encoding, -eofchar, -translation, or -inputmode} -returnCodes error +} -result {bad option "-winsize": should be one of -blocking, -buffering, -buffersize, -encoding, -eofchar, -nocomplainencoding, -strictencoding, -translation, or -inputmode} -returnCodes error ## fconfigure set stdout,stderr @@ -338,13 +338,13 @@ test console-fconfigure-set-2.0 { fconfigure stdout -winsize } -constraints {win interactive} -body { fconfigure stdout -winsize {10 30} -} -result {bad option "-winsize": should be one of -blocking, -buffering, -buffersize, -encoding, -eofchar, or -translation} -returnCodes error +} -result {bad option "-winsize": should be one of -blocking, -buffering, -buffersize, -encoding, -eofchar, -nocomplainencoding, -strictencoding, or -translation} -returnCodes error test console-fconfigure-set-3.0 { fconfigure stderr -winsize } -constraints {win interactive} -body { fconfigure stderr -winsize {10 30} -} -result {bad option "-winsize": should be one of -blocking, -buffering, -buffersize, -encoding, -eofchar, or -translation} -returnCodes error +} -result {bad option "-winsize": should be one of -blocking, -buffering, -buffersize, -encoding, -eofchar, -nocomplainencoding, -strictencoding, or -translation} -returnCodes error # Multiple threads |