diff options
| author | dgp <dgp@noemail.net> | 2013-09-20 05:28:59 (GMT) |
|---|---|---|
| committer | dgp <dgp@noemail.net> | 2013-09-20 05:28:59 (GMT) |
| commit | 0bfc488e0bca1a4d0fd3cd3d763da0c980637ac6 (patch) | |
| tree | 73db5c8849137e95cc78e49ede18119c97dec5b7 /generic | |
| parent | e9cfece0e2d25b06a1aba8a6de87a25b672466e9 (diff) | |
| parent | 1d45e7ab41b61b2126189faded9db54dab5fecfe (diff) | |
| download | tcl-0bfc488e0bca1a4d0fd3cd3d763da0c980637ac6.zip tcl-0bfc488e0bca1a4d0fd3cd3d763da0c980637ac6.tar.gz tcl-0bfc488e0bca1a4d0fd3cd3d763da0c980637ac6.tar.bz2 | |
merge release
FossilOrigin-Name: 63009ab07cd905922d010d4c075f9de128696ae7
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tcl.h | 4 | ||||
| -rw-r--r-- | generic/tclIOUtil.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/generic/tcl.h b/generic/tcl.h index a833218..1b120fb 100644 --- a/generic/tcl.h +++ b/generic/tcl.h @@ -56,10 +56,10 @@ extern "C" { #define TCL_MAJOR_VERSION 8 #define TCL_MINOR_VERSION 6 #define TCL_RELEASE_LEVEL TCL_FINAL_RELEASE -#define TCL_RELEASE_SERIAL 0 +#define TCL_RELEASE_SERIAL 1 #define TCL_VERSION "8.6" -#define TCL_PATCH_LEVEL "8.6.0" +#define TCL_PATCH_LEVEL "8.6.1" /* *---------------------------------------------------------------------------- diff --git a/generic/tclIOUtil.c b/generic/tclIOUtil.c index 6259216..6332453 100644 --- a/generic/tclIOUtil.c +++ b/generic/tclIOUtil.c @@ -1944,7 +1944,7 @@ TclNREvalFile( iPtr->evalFlags |= TCL_EVAL_FILE; TclNRAddCallback(interp, EvalFileCallback, oldScriptFile, pathPtr, objPtr, NULL); - return TclNREvalObjEx(interp, objPtr, 0, NULL, INT_MIN); + return TclNREvalObjEx(interp, objPtr, TCL_EVAL_DIRECT, NULL, INT_MIN); } static int |