diff options
| -rw-r--r-- | generic/tclZipfs.c | 2 | ||||
| -rw-r--r-- | tests/unixInit.test | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/generic/tclZipfs.c b/generic/tclZipfs.c index b72abfc..0c964e8 100644 --- a/generic/tclZipfs.c +++ b/generic/tclZipfs.c @@ -4240,6 +4240,8 @@ ScriptLibrarySetup( Tcl_IncrRefCount(searchPathObj); Tcl_SetEncodingSearchPath(searchPathObj); Tcl_DecrRefCount(searchPathObj); + /* Bug [fccb9f322f]. Reinit system encoding after setting search path */ + TclpSetInitialEncodings(); return libDirObj; } diff --git a/tests/unixInit.test b/tests/unixInit.test index 3bbe1e9..099dccb 100644 --- a/tests/unixInit.test +++ b/tests/unixInit.test @@ -100,7 +100,7 @@ test unixInit-3.2 {TclpSetInitialEncodings} -setup { catch {set oldlc_all $env(LC_ALL)} catch {set oldtcl_library $env(TCL_LIBRARY)} unset -nocomplain env(TCL_LIBRARY) -} -constraints {unix stdio knownBug} -body { +} -constraints {unix stdio} -body { set env(LANG) japanese set env(LC_ALL) japanese set f [open "|[list [interpreter]]" w+] |