diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-10-22 14:31:26 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-10-22 14:31:26 (GMT) |
| commit | 021af90722d6cf901b75e8f36f0d6cf0a62ed56e (patch) | |
| tree | 210b8a5ec1f4880f7174f9fa3f59c93e14544f3b /library/safe.tcl | |
| parent | d970d6f3f67a50a0b71ef5d61f77c9353a09ef64 (diff) | |
| parent | be83197ee590ec252235b5684a13f8d42e35c814 (diff) | |
| download | tcl-021af90722d6cf901b75e8f36f0d6cf0a62ed56e.zip tcl-021af90722d6cf901b75e8f36f0d6cf0a62ed56e.tar.gz tcl-021af90722d6cf901b75e8f36f0d6cf0a62ed56e.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'library/safe.tcl')
| -rw-r--r-- | library/safe.tcl | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/library/safe.tcl b/library/safe.tcl index 1f8c3d2..4c0f3b1 100644 --- a/library/safe.tcl +++ b/library/safe.tcl @@ -937,7 +937,7 @@ proc ::safe::AliasSource {child args} { } } else { set at 0 - set encoding {} + set encoding utf-8 } if {$argc != 1} { set msg "wrong # args: should be \"source ?-encoding E? fileName\"" @@ -980,10 +980,7 @@ proc ::safe::AliasSource {child args} { set replacementMsg "script error" set code [catch { set f [open $realfile] - fconfigure $f -eofchar \032 - if {$encoding ne ""} { - fconfigure $f -encoding $encoding - } + fconfigure $f -encoding $encoding -eofchar \032 set contents [read $f] close $f ::interp eval $child [list info script $file] |