summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2013-09-26 16:32:21 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2013-09-26 16:32:21 (GMT)
commitac2d8a32cbf79c952b06116a786c2466322ad368 (patch)
tree00a289e9d95d3bc7852194ae11167c5bc96f414a /generic
parente3309e4d57407994dfba25053019cd7f1f5bd083 (diff)
parent38f8605a8d202951bbf792a4813b9b48a20910fb (diff)
downloadtcl-ac2d8a32cbf79c952b06116a786c2466322ad368.zip
tcl-ac2d8a32cbf79c952b06116a786c2466322ad368.tar.gz
tcl-ac2d8a32cbf79c952b06116a786c2466322ad368.tar.bz2
merge trunk
Diffstat (limited to 'generic')
-rw-r--r--generic/tclBinary.c6
-rw-r--r--generic/tclEvent.c2
-rw-r--r--generic/tclIOUtil.c2
3 files changed, 5 insertions, 5 deletions
diff --git a/generic/tclBinary.c b/generic/tclBinary.c
index 58583f4..4e977f2 100644
--- a/generic/tclBinary.c
+++ b/generic/tclBinary.c
@@ -2500,7 +2500,8 @@ BinaryEncode64(
return TCL_ERROR;
}
if (maxlen < 0) {
- Tcl_SetResult(interp, "line length out of range", TCL_STATIC);
+ Tcl_SetObjResult(interp, Tcl_NewStringObj(
+ "line length out of range", -1));
Tcl_SetErrorCode(interp, "TCL", "BINARY", "ENCODE",
"LINE_LENGTH", NULL);
return TCL_ERROR;
@@ -2606,7 +2607,8 @@ BinaryEncodeUu(
return TCL_ERROR;
}
if (lineLength < 3 || lineLength > 85) {
- Tcl_SetResult(interp, "line length out of range", TCL_STATIC);
+ Tcl_SetObjResult(interp, Tcl_NewStringObj(
+ "line length out of range", -1));
Tcl_SetErrorCode(interp, "TCL", "BINARY", "ENCODE",
"LINE_LENGTH", NULL);
return TCL_ERROR;
diff --git a/generic/tclEvent.c b/generic/tclEvent.c
index 686b80d..941d566 100644
--- a/generic/tclEvent.c
+++ b/generic/tclEvent.c
@@ -1171,8 +1171,6 @@ Tcl_Finalize(void)
TclFinalizeEncodingSubsystem();
- Tcl_SetPanicProc(NULL);
-
/*
* Repeat finalization of the thread local storage once more. Although
* this step is already done by the Tcl_FinalizeThread call above, series
diff --git a/generic/tclIOUtil.c b/generic/tclIOUtil.c
index 6332453..6259216 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, TCL_EVAL_DIRECT, NULL, INT_MIN);
+ return TclNREvalObjEx(interp, objPtr, 0, NULL, INT_MIN);
}
static int