diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-03-07 22:09:31 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-03-07 22:09:31 (GMT) |
| commit | 745ce07c54f7fe7ed7a1f0a3d86c995380ce6290 (patch) | |
| tree | b1354b5cf9ec9b65366b7000b3036e10e7938378 | |
| parent | 4b381be96f2485ee84ae4cd9f8c4a06c29c6bde9 (diff) | |
| download | tcl-745ce07c54f7fe7ed7a1f0a3d86c995380ce6290.zip tcl-745ce07c54f7fe7ed7a1f0a3d86c995380ce6290.tar.gz tcl-745ce07c54f7fe7ed7a1f0a3d86c995380ce6290.tar.bz2 | |
put -checkbom encoding only when encoding is not set
| -rw-r--r-- | generic/tclIOUtil.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/generic/tclIOUtil.c b/generic/tclIOUtil.c index 823f18a..8b8ad30 100644 --- a/generic/tclIOUtil.c +++ b/generic/tclIOUtil.c @@ -1778,17 +1778,18 @@ Tcl_FSEvalFileEx( * it (and use the system encoding) Report error on unknown encoding. */ - if (Tcl_SetChannelOption(interp, chan, "-checkbom", "1") - != TCL_OK) { - Tcl_Close(interp,chan); - return result; - } if (encodingName != NULL) { if (Tcl_SetChannelOption(interp, chan, "-encoding", encodingName) != TCL_OK) { Tcl_Close(interp,chan); return result; } + } else { + if (Tcl_SetChannelOption(interp, chan, "-checkbom", "1") + != TCL_OK) { + Tcl_Close(interp,chan); + return result; + } } objPtr = Tcl_NewObj(); |